diff --git a/.codecov.yml b/.codecov.yml
index 194d876f..cfa9b65f 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -24,39 +24,39 @@ coverage:
       linux-1.13:
         <<: *projects
         flags:
-          - "linux-1.13"
+          - "linux-1.14"
       linux-1.14:
         <<: *projects
         flags:
-          - "linux-1.14"
+          - "linux-1.15"
       linux-1.15:
         <<: *projects
         flags:
-          - "linux-1.15"
+          - "linux-1.16"
       macos-1.13:
         <<: *projects
         flags:
-          - "macos-1.13"
+          - "macos-1.14"
       macos-1.14:
         <<: *projects
         flags:
-          - "macos-1.14"
+          - "macos-1.15"
       macos-1.15:
         <<: *projects
         flags:
-          - "macos-1.15"
+          - "macos-1.16"
       windows-1.13:
         <<: *projects
         flags:
-          - "windows-1.13"
+          - "windows-1.14"
       windows-1.14:
         <<: *projects
         flags:
-          - "windows-1.14"
+          - "windows-1.15"
       windows-1.15:
         <<: *projects
         flags:
-          - "windows-1.15"
+          - "windows-1.16"
     patch:
       default: false
       linux-1.13:
@@ -85,21 +85,17 @@ coverage:
         branches:
           - master
         flags:
-          - "linux-1.13"
           - "linux-1.14"
           - "linux-1.15"
-          - "macos-1.13"
+          - "linux-1.16"
           - "macos-1.14"
           - "macos-1.15"
-          - "windows-1.13"
+          - "macos-1.16"
           - "windows-1.14"
           - "windows-1.15"
+          - "windows-1.16"
 
 flags:
-  linux-1.13:
-    paths:
-      - /
-    carryforward: true
   linux-1.14:
     paths:
       - /
@@ -108,7 +104,7 @@ flags:
     paths:
       - /
     carryforward: true
-  macos-1.13:
+  linux-1.16:
     paths:
       - /
     carryforward: true
@@ -120,7 +116,7 @@ flags:
     paths:
       - /
     carryforward: true
-  windows-1.13:
+  macos-1.16:
     paths:
       - /
     carryforward: true
@@ -132,6 +128,10 @@ flags:
     paths:
       - /
     carryforward: true
+  windows-1.16:
+    paths:
+      - /
+    carryforward: true
 
 comment:
   behavior: default
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 68952cf2..ab5a2dce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,36 +53,36 @@ jobs:
     - name: Cache Go module and build cache
       uses: actions/cache@v2
       with:
-        key: ${{ env.OS }}-go-${{ hashFiles('**/go.mod') }}
+        key: go-${{ env.OS }}-${{ hashFiles('**/go.mod') }}
         path: |
           ~/go/pkg/mod               # Module download cache
           ~/.cache/go-build          # Build cache (Linux)
           ~/Library/Caches/go-build  # Build cache (Mac)
           '%LocalAppData%\go-build'  # Build cache (Windows)
         restore-keys: |
-          ${{ env.OS }}-go-
+          go-${{ env.OS }}-
 
     - name: Cache nvim binary for linux and darwin
       id: cache-nvim
       uses: actions/cache@v2
       if: ${{ env.OS != 'windows' }}
       with:
-        key: ${{ env.OS }}-nvim-${{ hashFiles('~/nvim/bin/nvim') }}
+        key: nvim-${{ env.OS }}-${{ hashFiles('~/nvim/bin/nvim') }}
         path: |
           ~/nvim
         restore-keys: |
-          ${{ env.OS }}-nvim-
+          nvim-${{ env.OS }}-
 
     - name: Cache nvim binary for Windows
       id: cache-nvim-windows
       uses: actions/cache@v2
       if: ${{ env.OS == 'windows' }}
       with:
-        key: ${{ env.OS }}-nvim-${{ hashFiles('~/nvim/bin/nvim.exe') }}
+        key: nvim-${{ env.OS }}-${{ hashFiles('~/nvim/bin/nvim.exe') }}
         path: |
           ~/nvim
         restore-keys: |
-          ${{ env.OS }}-nvim-
+          nvim-${{ env.OS }}-
 
     - name: Install nvim binary
       uses: rhysd/action-setup-vim@v1