diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 319e46f..16fa2ae 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -7,11 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true # 'bundle install' and cache
-    - name: Run RuboCop
-      run: bundle exec rubocop --parallel
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Ruby and Bundle Install
+        uses: ruby/setup-ruby@v1
+
+        with:
+          bundler-cache: true
+          ruby-version: '2.7'
+
+      - name: RuboCop
+        run: bundle exec rubocop --parallel
diff --git a/.github/workflows/ci.yml b/.github/workflows/tests.yml
similarity index 67%
rename from .github/workflows/ci.yml
rename to .github/workflows/tests.yml
index 4928991..ace75b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/tests.yml
@@ -1,38 +1,48 @@
-name: Test
+name: Tests
 
-on:
-  push:
-  pull_request:
+on: [push, pull_request]
 
 jobs:
   test:
+    runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
+
       matrix:
         ruby:
-          - 2.7
+          - '2.7'
           - '3.0'
           - '3.1'
+
     services:
       mysql:
-        image: mysql:8
         env:
           MYSQL_DATABASE: rating_test
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-        ports:
-          - 3306:3306
+
+        image: mysql:8
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
-    runs-on: ubuntu-latest
+        ports:
+          - 3306:3306
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Ruby and Bundle Install
+        uses: ruby/setup-ruby@v1
+
         with:
-          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: 'Runs tests'
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Runs tests
         run: bundle exec rake spec
-      - name: 'Runs tests with config enabled'
+
+      - name: Runs tests with config enabled
         run: bundle exec rake spec_config
-      - name: 'Runs tests with config enabled for extra scopes'
+
+      - name: Runs tests with config enabled for extra scopes
         run: bundle exec rake spec_config_with_extra_scopes