diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000..b79eb6c1a
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,5 @@
+queries:
+  - uses: security-and-quality
+  
+paths:
+  - src
\ No newline at end of file
diff --git a/.github/workflows/CI-PR.yml b/.github/workflows/CI-PR.yml
deleted file mode 100644
index ee158604b..000000000
--- a/.github/workflows/CI-PR.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: CI-PR
-
-on:
-  pull_request:
-    branches:
-      - dev
-    paths:
-      - 'sample/**'
-      - 'src/**'
-
-env:
-  VERSION: ''
-  BRANCH: ''
-  
-jobs:  
-  build:
-    name: Build and verify library    
-    runs-on: ubuntu-latest  
-    steps:
-      - uses: actions/checkout@v2   
-        with:
-          fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
-      - uses: dotnet/nbgv@master
-        with:
-          setAllVars: true
-      - name: Setting VERSION and BRANCH env
-        run: |
-          echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-          echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
-      - name: Update tokens in project files
-        uses: cschleiden/replace-tokens@v1
-        with:
-          files: '["*.csproj", "**/*.csproj"]'
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.202'
-      - name: Building library
-        run: |
-          dotnet restore src
-          dotnet build src/bunit.core/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.web/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.xunit/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.testassets/ -c Release --no-restore
-      - name: Running unit tests
-        run: |
-          dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-      - name: Creating library package
-        run: |
-          dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit.web/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit.xunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-      - name: Buidling template package
-        run: dotnet pack src/bunit.template/ -c Release -o ${GITHUB_WORKSPACE}/packages
-      - name: Verifying template
-        run: |
-          dotnet new --install ${GITHUB_WORKSPACE}/packages/bunit.template.$VERSION.nupkg
-          dotnet new bunit --no-restore -o ${GITHUB_WORKSPACE}/Test
-          dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/packages
-          dotnet test ${GITHUB_WORKSPACE}/Test
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
deleted file mode 100644
index bd51d6930..000000000
--- a/.github/workflows/CI.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - dev
-    paths:
-      - 'sample/**'
-      - 'src/**'
-
-env:
-  VERSION: ''
-  BRANCH: ''
-  
-jobs:  
-  build:
-    name: Build and verify library    
-    runs-on: ubuntu-latest  
-    steps:
-      - uses: actions/checkout@v2   
-        with:
-          fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
-      - uses: dotnet/nbgv@master
-        with:
-          setAllVars: true
-      - name: Setting VERSION and BRANCH env
-        run: |
-          echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-          echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
-      - name: Update tokens in project files
-        uses: cschleiden/replace-tokens@v1
-        with:
-          files: '["*.csproj", "**/*.csproj"]'
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.202'     
-      - name: Building library
-        run: |
-          dotnet restore src
-          dotnet build src/bunit.core/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.web/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.xunit/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.testassets/ -c Release --no-restore
-      - name: Running unit tests
-        run: |
-          dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-      - name: Creating library package
-        run: |
-          dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit.web/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit.xunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet pack src/bunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-      - name: Buidling template package
-        run: dotnet pack src/bunit.template/ -c Release -o ${GITHUB_WORKSPACE}/packages
-      - name: Verifying template
-        run: |
-          dotnet new --install ${GITHUB_WORKSPACE}/packages/bunit.template.$VERSION.nupkg
-          dotnet new bunit --no-restore -o ${GITHUB_WORKSPACE}/Test
-          dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/packages
-          dotnet test ${GITHUB_WORKSPACE}/Test
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..e48ab5897
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,58 @@
+name: "CodeQL Scanning"
+
+on:
+  push:
+    branches:
+      - dev
+      - main
+    paths:
+      - 'src/**'
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:  
+  code-scan:    
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 0
+
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.100-preview.7.20366.6'
+    - name: Move .net SDK's to shared folder (hack)
+      shell: pwsh
+      run: |
+        $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+        $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+        $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+        foreach ($dir in $directories) {
+          $from = $dir.FullName;
+          $to = "$root/$version";
+          Write-Host Copying from $from to $to;
+          Copy-Item "$from\*" $to -Recurse -Force;
+        }
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: csharp
+        config-file: ./.github/codeql/codeql-config.yml
+
+    - name: Building library
+      run: dotnet build src -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1          
\ No newline at end of file
diff --git a/.github/workflows/CI-CD-Docs.yml b/.github/workflows/deploy-docs.yml
similarity index 59%
rename from .github/workflows/CI-CD-Docs.yml
rename to .github/workflows/deploy-docs.yml
index 9f49c8420..8985a7801 100644
--- a/.github/workflows/CI-CD-Docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -1,4 +1,4 @@
-name: Build and Deploy Docs
+name: "Build and Deploy Docs"
 
 on:
   push:
@@ -15,34 +15,49 @@ jobs:
       - uses: actions/checkout@v2   
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
       - uses: dotnet/nbgv@master
         with:
           setAllVars: true
+
       - name: Setting VERSION
         run: echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
+      
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1
         with:
           files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj"]'
+      
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'
-      - name: Building library
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: DOTNET HACK
+        shell: pwsh
         run: |
-          dotnet restore src
-          dotnet build src/bunit.core/ --no-restore -p:version=$VERSION
-          dotnet build src/bunit.web/ --no-restore -p:version=$VERSION
-          dotnet build src/bunit.xunit/ --no-restore -p:version=$VERSION
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          }
+      
+      - name: Building library
+        run: dotnet build src -p:version=$VERSION
+
       - name: Verfiy docs samples
-        run: |
-          dotnet test docs/samples/tests/mstest
-          dotnet test docs/samples/tests/nunit
-          dotnet test docs/samples/tests/razor
-          dotnet test docs/samples/tests/xunit
+        run: dotnet test docs/samples
+
       - name: Building docs
         run: |    
           dotnet build docs/site/
           dotnet build docs/site/          
+          
       - name: Deploy to GitHub Pages
         if: success()
         uses: crazy-max/ghaction-github-pages@v2
diff --git a/.github/workflows/DEV-GPR-PUSH.yml b/.github/workflows/publish-nightly-to-gpr.yml
similarity index 50%
rename from .github/workflows/DEV-GPR-PUSH.yml
rename to .github/workflows/publish-nightly-to-gpr.yml
index 36cd4b96b..21cf1adb2 100644
--- a/.github/workflows/DEV-GPR-PUSH.yml
+++ b/.github/workflows/publish-nightly-to-gpr.yml
@@ -1,4 +1,4 @@
-name: DEV-GPR-PUSH
+name: Push nightly to GPR
 
 on:
   push:
@@ -8,51 +8,67 @@ on:
       - 'src/bunit.core/**'
       - 'src/bunit.web/**'
       - 'src/bunit.xunit/**'
+      - 'src/bunit.template/**'
 
 env:
   VERSION: ''
   BRANCH: ''
   
 jobs:  
-  build:
-    name: Build and verify library    
+  push-to-gpr:
     runs-on: ubuntu-latest  
     steps:
-      - uses: actions/checkout@v2   
+      - name: Checkout Repository
+        uses: actions/checkout@v2   
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
       - uses: dotnet/nbgv@master
         with:
           setAllVars: true
+
       - name: Setting VERSION and BRANCH env
         run: |
           echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
           echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
+
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1
         with:
           files: '["*.csproj", "**/*.csproj"]'
+
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'     
-      - name: Building library
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: DOTNET HACK
+        shell: pwsh
         run: |
-          dotnet restore src
-          dotnet build src/bunit.core/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.web/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.xunit/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
-          dotnet build src/bunit.testassets/ -c Release --no-restore
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          }    
+
+      - name: Building library
+        run: dotnet build src -c Release -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
+
       - name: Running unit tests
-        run: |
-          dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
+        run: dotnet test src --verbosity normal /nowarn:CS1591 /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=lcov
+
       - name: Creating library package
         run: |
           dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
           dotnet pack src/bunit.web/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
           dotnet pack src/bunit.xunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
           dotnet pack src/bunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
+      
       - name: Buidling template package
         run: dotnet pack src/bunit.template/ -c Release -o ${GITHUB_WORKSPACE}/packages
       - name: Verifying template
@@ -61,6 +77,45 @@ jobs:
           dotnet new bunit --no-restore -o ${GITHUB_WORKSPACE}/Test
           dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/packages
           dotnet test ${GITHUB_WORKSPACE}/Test
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.core.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.core.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.web.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.web.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.xunit.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.xunit.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true
+
       - name: Push packages to GitHub Package Registry
         run: |
            for f in ${GITHUB_WORKSPACE}/packages/*.nupkg
diff --git a/.github/workflows/NUGET-PUSH.yml b/.github/workflows/publish-nuget-force.yml
similarity index 84%
rename from .github/workflows/NUGET-PUSH.yml
rename to .github/workflows/publish-nuget-force.yml
index b022eea2c..76f239ba9 100644
--- a/.github/workflows/NUGET-PUSH.yml
+++ b/.github/workflows/publish-nuget-force.yml
@@ -1,4 +1,4 @@
-name: NUGET-PUSH
+name: "Publish to NuGet (forced)"
 
 on:
   push:
@@ -30,7 +30,22 @@ jobs:
           files: '["*.csproj", "**/*.csproj"]'
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'  
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: DOTNET HACK
+        shell: pwsh
+        run: |
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          } 
       - name: Building library
         run: |
           dotnet restore src
diff --git a/.github/workflows/RELEASE.yml b/.github/workflows/publish-packages.yml
similarity index 73%
rename from .github/workflows/RELEASE.yml
rename to .github/workflows/publish-packages.yml
index 0c36f93df..0a441000c 100644
--- a/.github/workflows/RELEASE.yml
+++ b/.github/workflows/publish-packages.yml
@@ -1,4 +1,4 @@
-name: RELEASE
+name: "Publish release to NuGet and GPR"
 
 on:
   release:
@@ -10,55 +10,72 @@ env:
   BRANCH: 'main'  
 
 jobs:  
-  build:
-    name: Build and verify library    
+  nuget-release:
     runs-on: ubuntu-latest  
     steps:
       - uses: actions/checkout@v2   
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+      
       - uses: dotnet/nbgv@master
         with:
           setAllVars: true
+
       - name: Setting VERSION and BRANCH env
         run: |
           echo "::set-env name=VERSION::$NBGV_SimpleVersion$NBGV_PrereleaseVersion"
           echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
+
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1
         with:
           files: '["*.csproj", "**/*.csproj"]'
+
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'  
-      - name: Building library
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: DOTNET HACK
+        shell: pwsh
         run: |
-          dotnet restore src
-          dotnet build src/bunit.core/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
-          dotnet build src/bunit.web/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
-          dotnet build src/bunit.xunit/ -c Release --no-restore -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
-          dotnet build src/bunit.testassets/ -c Release --no-restore 
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          } 
+
+      - name: Building library
+        run: dotnet build src -c Release -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
+
       - name: Running unit tests
-        run: |
-          dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
-          dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
+        run: dotnet test src -c Release --verbosity normal /nowarn:CS1591
+      
       - name: Creating library package
         run: |
           dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
           dotnet pack src/bunit.web/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
           dotnet pack src/bunit.xunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
           dotnet pack src/bunit/ -c Release -o ${GITHUB_WORKSPACE}/packages -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true /p:PublicRelease=true
+      
       - name: Buidling template package
         run: dotnet pack src/bunit.template/ -c Release -o ${GITHUB_WORKSPACE}/packages /p:PublicRelease=true
+      
       - name: Verifying template
         run: |
           dotnet new --install ${GITHUB_WORKSPACE}/packages/bunit.template.$VERSION.nupkg
           dotnet new bunit --no-restore -o ${GITHUB_WORKSPACE}/Test
           dotnet restore ${GITHUB_WORKSPACE}/Test/Test.csproj --source ${GITHUB_WORKSPACE}/packages
           dotnet test ${GITHUB_WORKSPACE}/Test
+      
       - name: Push packages to NuGet
         run: dotnet nuget push ${GITHUB_WORKSPACE}/packages/'*.nupkg' -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate          
+      
       - name: Push packages to GitHub Package Registry
         run: |
            for f in ${GITHUB_WORKSPACE}/packages/*.nupkg
diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml
new file mode 100644
index 000000000..d49399e47
--- /dev/null
+++ b/.github/workflows/pull-request-checks.yml
@@ -0,0 +1,168 @@
+name: Pull request code checks
+
+on:
+  pull_request:
+    branches:
+      - dev
+    paths:
+      - 'src/**'
+
+jobs:
+  dotnet-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2   
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: Move .net SDK's to shared folder (hack)
+        shell: pwsh
+        run: |
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          }
+
+      - name: Running unit tests
+        run: dotnet test src --verbosity normal /nowarn:CS1591 /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=lcov
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.core.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.core.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.web.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.web.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.xunit.tests/coverage/coverage.net5.0.info
+          parallel: true
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: src/bunit.xunit.tests/coverage/coverage.netcoreapp3.1.info
+          parallel: true
+
+      - uses: coverallsapp/github-action@v1.1.1
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true
+
+  dotnet-format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.100-preview.7.20366.6'
+      - name: Move .net SDK's to shared folder (hack)
+        shell: pwsh
+        run: |
+          $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+          $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+          $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+          foreach ($dir in $directories) {
+            $from = $dir.FullName;
+            $to = "$root/$version";
+            Write-Host Copying from $from to $to;
+            Copy-Item "$from\*" $to -Recurse -Force;
+          }
+
+      - name: Install dotnet-format
+        run: dotnet tool install -g dotnet-format
+
+      - name: Run dotnet-format
+        run: dotnet format src --verbosity diag
+
+      - name: Commit formatted files      
+        uses: EndBug/add-and-commit@v4.1.0
+        with:
+          add: 'src'
+          author_name: Github Actions
+          author_email: actions@github.com
+          message: Automated dotnet-format update
+          ref: ${{ github.head_ref }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  code-scan:    
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 0
+
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.100-preview.7.20366.6'
+    - name: Move .net SDK's to shared folder (hack)
+      shell: pwsh
+      run: |
+        $version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
+        $root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
+        $directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
+        foreach ($dir in $directories) {
+          $from = $dir.FullName;
+          $to = "$root/$version";
+          Write-Host Copying from $from to $to;
+          Copy-Item "$from\*" $to -Recurse -Force;
+        }
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: csharp
+        config-file: ./.github/codeql/codeql-config.yml
+
+    - name: Building library
+      run: dotnet build src -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1          
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index eaa9e5fcc..c4fda8d79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -332,4 +332,5 @@ ASALocalRun/
 *.playlist
 bunit.docs/log.txt
 
-.store
\ No newline at end of file
+.store
+*coverage*.info
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3910fba89..40af9edaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ List of changes in existing functionality.
 
 - Moved `InvokeAsync()`, `Render()` and `SetParametersAndRender()` methods out of `IRenderedComponentBase<TComponent>` into extension methods. By [@JeroenBos](https://github.com/JeroenBos) in [#151](https://github.com/egil/bUnit/pull/177).
 - Accessing `Markup`, `Nodes` and related methods on a rendered fragment whose underlying component has been removed from the render tree (disposed) now throws a `ComponentDisposedException`. By [@egil](https://github.com/egil) in [#184](https://github.com/egil/bUnit/pull/184).
-
+- Changed bUnit's build to target both .net 5.0 and .net standard 2.1. By [@egil](https://github.com/egil) in [#187](https://github.com/egil/bUnit/pull/187).
 
 ### Deprecated
 List of soon-to-be removed features.
diff --git a/global.json b/global.json
deleted file mode 100644
index a1fd15db2..000000000
--- a/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "sdk": {
-    "version": "3.1.201",
-    "rollForward": "latestMinor",
-	"allowPrerelease": false
-  }
-}
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a4db6fa73..012a0fc0f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,16 +1,15 @@
 <Project>
-  <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
+	<PropertyGroup>
+		<LangVersion>8.0</LangVersion>
+		<Nullable>enable</Nullable>
+		<WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
 		<Deterministic>true</Deterministic>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 </Project>
diff --git a/src/bunit.core.tests/ComponentParameterFactoryTest.cs b/src/bunit.core.tests/ComponentParameterFactoryTest.cs
index 9a8e424b0..150cbf806 100644
--- a/src/bunit.core.tests/ComponentParameterFactoryTest.cs
+++ b/src/bunit.core.tests/ComponentParameterFactoryTest.cs
@@ -4,6 +4,9 @@
 using Bunit.Rendering;
 using Bunit.TestAssets.SampleComponents;
 using Bunit.TestDoubles.JSInterop;
+
+using Microsoft.AspNetCore.Components.Rendering;
+
 using Shouldly;
 
 using Xunit;
@@ -37,12 +40,12 @@ public void Test005()
 			instance.RegularParam.ShouldBe("some value");
 			instance.UnnamedCascadingValue.ShouldBe(42);
 			instance.NamedCascadingValue.ShouldBe(1337);
-			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(null)).Message.ShouldBe("NonGenericCallback");
+			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("NonGenericCallback");
 			Should.Throw<Exception>(async () => await instance.GenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("GenericCallback");
 
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.ChildContent!)).Markup.ShouldBe(nameof(ChildContent));
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.OtherContent!)).Markup.ShouldBe(nameof(AllTypesOfParams<string>.OtherContent));
-			Should.Throw<Exception>(() => instance.ItemTemplate!("")(null)).Message.ShouldBe("ItemTemplate");
+			Should.Throw<Exception>(() => instance.ItemTemplate!("")(new RenderTreeBuilder())).Message.ShouldBe("ItemTemplate");
 		}
 
 		[Fact(DisplayName = "All types of parameters are correctly assigned to component on re-render")]
@@ -77,11 +80,11 @@ public void Test002()
 
 			instance.Attributes["some-unmatched-attribute"].ShouldBe("unmatched value");
 			instance.RegularParam.ShouldBe("some value");
-			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(null)).Message.ShouldBe("NonGenericCallback");
+			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("NonGenericCallback");
 			Should.Throw<Exception>(async () => await instance.GenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("GenericCallback");
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.ChildContent!)).Markup.ShouldBe(nameof(ChildContent));
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.OtherContent!)).Markup.ShouldBe(nameof(AllTypesOfParams<string>.OtherContent));
-			Should.Throw<Exception>(() => instance.ItemTemplate!("")(null)).Message.ShouldBe("ItemTemplate");
+			Should.Throw<Exception>(() => instance.ItemTemplate!("")(new RenderTreeBuilder())).Message.ShouldBe("ItemTemplate");
 		}
 
 		[Fact(DisplayName = "Template(name, markupFactory) helper correctly renders markup template")]
diff --git a/src/bunit.core.tests/Rendering/ComponentParameterTest.cs b/src/bunit.core.tests/Rendering/ComponentParameterTest.cs
index 2279cc2c7..bab74fe37 100644
--- a/src/bunit.core.tests/Rendering/ComponentParameterTest.cs
+++ b/src/bunit.core.tests/Rendering/ComponentParameterTest.cs
@@ -6,7 +6,7 @@
 namespace Bunit.Rendering
 {
 	public class ComponentParameterTest
-    {
+	{
 		public static IEnumerable<object[]> GetEqualsTestData()
 		{
 			var name = "foo";
@@ -65,5 +65,5 @@ public void Test005(ComponentParameter left, ComponentParameter right, bool expe
 		{
 			left.GetHashCode().Equals(right.GetHashCode()).ShouldBe(expectedResult);
 		}
-    }
+	}
 }
diff --git a/src/bunit.core.tests/bunit.core.tests.csproj b/src/bunit.core.tests/bunit.core.tests.csproj
index 60a63cc8b..91c7a43ff 100644
--- a/src/bunit.core.tests/bunit.core.tests.csproj
+++ b/src/bunit.core.tests/bunit.core.tests.csproj
@@ -1,37 +1,46 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
-		<IsPackable>false</IsPackable>
-		<RootNamespace>Bunit</RootNamespace>
-		<AssemblyName>Bunit.Core.Tests</AssemblyName>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <RootNamespace>Bunit</RootNamespace>
+    <AssemblyName>Bunit.Core.Tests</AssemblyName>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
-		<PackageReference Include="AngleSharp" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-		<PackageReference Include="Moq" Version="4.14.1" />
-		<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
-		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="1.2.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\bunit.core\bunit.core.csproj" />
-		<ProjectReference Include="..\bunit.web\bunit.web.csproj" />
-		<ProjectReference Include="..\bunit.xunit\bunit.xunit.csproj" />
-		<ProjectReference Include="..\bunit.testassets\bunit.testassets.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="0.14.0" />
+    <PackageReference Include="AngleSharp.Css" Version="0.14.0" />
+    <PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" Version="4.14.1" />
+    <PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\bunit.core\bunit.core.csproj" />
+    <ProjectReference Include="..\bunit.web\bunit.web.csproj" />
+    <ProjectReference Include="..\bunit.xunit\bunit.xunit.csproj" />
+    <ProjectReference Include="..\bunit.testassets\bunit.testassets.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/bunit.core/Extensions/ComponentParameterExtensions.cs b/src/bunit.core/Extensions/ComponentParameterExtensions.cs
index 2ac2dacd4..97401fb41 100644
--- a/src/bunit.core/Extensions/ComponentParameterExtensions.cs
+++ b/src/bunit.core/Extensions/ComponentParameterExtensions.cs
@@ -63,7 +63,7 @@ static RenderFragment CreateComponentRenderFragment(IReadOnlyList<ComponentParam
 					for (var i = 0; i < parameters.Count; i++)
 					{
 						var para = parameters[i];
-						if (!para.IsCascadingValue)
+						if (!para.IsCascadingValue && para.Name is { })
 							builder.AddAttribute(i + 1, para.Name, para.Value);
 					}
 
diff --git a/src/bunit.core/Extensions/EnumerableExtensions.cs b/src/bunit.core/Extensions/EnumerableExtensions.cs
new file mode 100644
index 000000000..249a848ce
--- /dev/null
+++ b/src/bunit.core/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+
+namespace Bunit.Extensions
+{
+	/// <summary>
+	/// Helper methods for working with <see cref="IEnumerable{T}"/>
+	/// </summary>
+	public static class EnumerableExtensions
+	{
+		/// <summary>
+		/// Returns true if the numerable is null or empty.
+		/// </summary>
+		public static bool IsNullOrEmpty<T>([NotNullWhen(false)] this IEnumerable<T>? enumerable)
+		{
+			return enumerable is null || !enumerable.Any();
+		}
+	}
+}
diff --git a/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs b/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs
index b2f158c44..4809acf80 100644
--- a/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs
+++ b/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Bunit.Rendering;
@@ -72,12 +72,16 @@ private static ParameterView ToParameterView(IReadOnlyList<ComponentParameter> p
 			var parameterView = ParameterView.Empty;
 			if (parameters.Any())
 			{
-				var paramDict = new Dictionary<string, object?>();
+				var paramDict = new Dictionary<string, object>();
 				foreach (var param in parameters)
 				{
 					if (param.IsCascadingValue)
 						throw new InvalidOperationException($"You cannot provide a new cascading value through the {nameof(SetParametersAndRender)} method.");
-					paramDict.Add(param.Name!, param.Value);
+					if (param.Name is null)
+						throw new InvalidOperationException($"A parameters name is required.");
+
+					// BANG: it should technically be allowed to pass null
+					paramDict.Add(param.Name, param.Value!);
 				}
 				parameterView = ParameterView.FromDictionary(paramDict);
 			}
diff --git a/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs b/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs
index 984d6aa61..6d1b8a544 100644
--- a/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs
+++ b/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs
@@ -27,7 +27,7 @@ public static void WaitForState(this IRenderedFragmentBase renderedFragment, Fun
 			{
 				waiter.WaitTask.Wait();
 			}
-			catch (AggregateException e)
+			catch (AggregateException e) when (e.InnerException is { })
 			{
 				throw e.InnerException;
 			}
@@ -50,7 +50,7 @@ public static void WaitForAssertion(this IRenderedFragmentBase renderedFragment,
 			{
 				waiter.WaitTask.Wait();
 			}
-			catch (AggregateException e)
+			catch (AggregateException e) when (e.InnerException is { })
 			{
 				throw e.InnerException;
 			}
diff --git a/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs b/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs
index e538f1f55..ca30657a3 100644
--- a/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs
+++ b/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs
@@ -108,7 +108,7 @@ private void OnAfterRender()
 			}
 		}
 
-		private void OnTimeout(object state)
+		private void OnTimeout(object? state)
 		{
 			if (_isDisposed)
 				return;
diff --git a/src/bunit.core/RazorTesting/FixtureBase.cs b/src/bunit.core/RazorTesting/FixtureBase.cs
index d000d53cc..e3ad049fa 100644
--- a/src/bunit.core/RazorTesting/FixtureBase.cs
+++ b/src/bunit.core/RazorTesting/FixtureBase.cs
@@ -20,7 +20,7 @@ public abstract class FixtureBase<TFixture> : RazorTestBase
 		/// <summary>
 		/// Gets or sets the child content of the fragment.
 		/// </summary>
-		[Parameter] public RenderFragment ChildContent { get; set; } = default!;
+		[Parameter] public RenderFragment? ChildContent { get; set; }
 
 		/// <summary>
 		/// Gets or sets the setup action to perform before the <see cref="Test"/> action or
@@ -48,20 +48,6 @@ public abstract class FixtureBase<TFixture> : RazorTestBase
 		/// </summary>
 		[Parameter] public Func<TFixture, Task>? TestAsync { get; set; }
 
-		/// <summary>
-		/// Obsolete. Methods assigned to this parameter will not be invoked.
-		/// </summary>
-		[Obsolete("This feature has been removed since it caused confusion about the state of the fixture being passed to the test methods. Methods assigned to this parameter will not be invoked.")]
-		[Parameter]
-		public IReadOnlyCollection<Action<TFixture>>? Tests { get; set; }
-
-		/// <summary>
-		/// Obsolete. Methods assigned to this parameter will not be invoked.
-		/// </summary>
-		[Obsolete("This feature has been removed since it caused confusion about the state of the fixture being passed to the test methods. Methods assigned to this parameter will not be invoked.")]
-		[Parameter]
-		public IReadOnlyCollection<Func<TFixture, Task>>? TestsAsync { get; set; }
-
 		/// <inheritdoc/>
 		public override Task SetParametersAsync(ParameterView parameters)
 		{
@@ -71,17 +57,9 @@ public override Task SetParametersAsync(ParameterView parameters)
 			Test = parameters.GetValueOrDefault<Action<TFixture>>(nameof(Test));
 			TestAsync = parameters.GetValueOrDefault<Func<TFixture, Task>>(nameof(TestAsync));
 
-#pragma warning disable CS0618 // Type or member is obsolete
-			if (parameters.TryGetValue<IReadOnlyCollection<Action<TFixture>>>(nameof(Tests), out var tests))
-				Tests = tests;
-			if (parameters.TryGetValue<IReadOnlyCollection<Func<TFixture, Task>>>(nameof(TestsAsync), out var asyncTests))
-				TestsAsync = asyncTests;
-#pragma warning restore CS0618 // Type or member is obsolete
-
 			return base.SetParametersAsync(parameters);
 		}
 
-
 		/// <inheritdoc/>
 		[SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "Validating component parameters")]
 		public override void Validate()
@@ -93,12 +71,6 @@ public override void Validate()
 				throw new ArgumentException($"No test action provided via the '{nameof(Test)}' or '{nameof(TestAsync)}' parameters to the {GetType().Name} component.", nameof(Test));
 			if (Test is { } && TestAsync is { })
 				throw new ArgumentException($"Only one of the '{nameof(Test)}' or '{nameof(TestAsync)}' actions can be provided to the {GetType().Name} component at the same time.", nameof(Test));
-#pragma warning disable CS0618 // Type or member is obsolete
-			if (Tests is { })
-				throw new ArgumentException($"The use of the '{nameof(Tests)}' parameter has been obsoleted, and any methods assigned to it will not longer be invoked.");
-			if (TestsAsync is { })
-				throw new ArgumentException($"The use of the '{nameof(TestsAsync)}' parameter has been obsoleted, and any methods assigned to it will not longer be invoked.");
-#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		/// <inheritdoc/>
diff --git a/src/bunit.core/Rendering/ComponentParameter.cs b/src/bunit.core/Rendering/ComponentParameter.cs
index 1ce662763..6c4849310 100644
--- a/src/bunit.core/Rendering/ComponentParameter.cs
+++ b/src/bunit.core/Rendering/ComponentParameter.cs
@@ -79,7 +79,7 @@ public bool Equals(ComponentParameter other)
 			=> string.Equals(Name, other.Name, StringComparison.Ordinal) && Value == other.Value && IsCascadingValue == other.IsCascadingValue;
 
 		/// <inheritdoc/>
-		public override bool Equals(object obj) => obj is ComponentParameter other && Equals(other);
+		public override bool Equals(object? obj) => obj is ComponentParameter other && Equals(other);
 
 		/// <inheritdoc/>
 		public override int GetHashCode() => HashCode.Combine(Name, Value, IsCascadingValue);
diff --git a/src/bunit.core/Rendering/IRenderEventProducer.cs b/src/bunit.core/Rendering/IRenderEventProducer.cs
index f9e58c04d..d24d6ba43 100644
--- a/src/bunit.core/Rendering/IRenderEventProducer.cs
+++ b/src/bunit.core/Rendering/IRenderEventProducer.cs
@@ -1,4 +1,4 @@
-namespace Bunit.Rendering
+namespace Bunit.Rendering
 {
 	/// <summary>
 	/// Represents a producer of <see cref="RenderEvent"/>s.
diff --git a/src/bunit.core/TestServiceProvider.cs b/src/bunit.core/TestServiceProvider.cs
index cf9287900..ffcd71683 100644
--- a/src/bunit.core/TestServiceProvider.cs
+++ b/src/bunit.core/TestServiceProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -134,4 +134,4 @@ private void CheckInitializedAndThrow()
 				throw new InvalidOperationException("Services cannot be added to provider after it has been initialized.");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/bunit.core/bunit.core.csproj b/src/bunit.core/bunit.core.csproj
index aeed4febb..615c7f90c 100644
--- a/src/bunit.core/bunit.core.csproj
+++ b/src/bunit.core/bunit.core.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <RootNamespace>Bunit</RootNamespace>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<RazorLangVersion>3.0</RazorLangVersion>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Core</AssemblyName>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	</PropertyGroup>
 
 	<PropertyGroup>
 		<PackageId>bunit.core</PackageId>
@@ -26,21 +26,28 @@
 		<Description>
 			bUnit.core is the base library that provides support for testing Blazor components. You need to install bUnit.web as well to test web-based Blazor components.
 		</Description>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
diff --git a/src/bunit.sln b/src/bunit.sln
index ecb2b9882..d78a099a8 100644
--- a/src/bunit.sln
+++ b/src/bunit.sln
@@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{A5D7B6
 		.editorconfig = .editorconfig
 		..\CHANGELOG.md = ..\CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
-		..\global.json = ..\global.json
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
@@ -41,8 +40,12 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{785D7644-18F2-45E4-9B30-016ADB7AB9E3}"
 	ProjectSection(SolutionItems) = preProject
 		..\.github\workflows\CI-CD-Docs.yml = ..\.github\workflows\CI-CD-Docs.yml
+		..\.github\workflows\CI-PR.yml = ..\.github\workflows\CI-PR.yml
 		..\.github\workflows\CI.yml = ..\.github\workflows\CI.yml
+		..\.github\workflows\DEV-GPR-PUSH.yml = ..\.github\workflows\DEV-GPR-PUSH.yml
 		..\.github\workflows\nuget-pack-push.yml = ..\.github\workflows\nuget-pack-push.yml
+		..\.github\workflows\NUGET-PUSH.yml = ..\.github\workflows\NUGET-PUSH.yml
+		..\.github\workflows\RELEASE.yml = ..\.github\workflows\RELEASE.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.template", "bunit.template\bunit.template.csproj", "{58FB9C26-7170-426C-ACE8-A98237710CDB}"
diff --git a/src/bunit.template/bunit.template.csproj b/src/bunit.template/bunit.template.csproj
index 87c135f72..742185494 100644
--- a/src/bunit.template/bunit.template.csproj
+++ b/src/bunit.template/bunit.template.csproj
@@ -10,11 +10,11 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Description>A project template for a testing Blazor/Razor components using the bUnit library.</Description>
 		<PackageDescription>
-    A project template for a testing Blazor/Razor components using the bUnit library.
+			A project template for a testing Blazor/Razor components using the bUnit library.
 
-    bUnit is a testing library for Blazor Components. You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can easily interact with and inspect components, trigger event handlers, provide cascading values, inject services, mock IJSRuntime, and perform snapshot testing.
+			bUnit is a testing library for Blazor Components. You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can easily interact with and inspect components, trigger event handlers, provide cascading values, inject services, mock IJSRuntime, and perform snapshot testing.
 
-    The library's goal is to make it easy to write comprehensive, stable unit tests for Blazor Components/Razor Components. Go to bunit.egilhansen.com to learn more.
+			The library's goal is to make it easy to write comprehensive, stable unit tests for Blazor Components/Razor Components. Go to bunit.egilhansen.com to learn more.
 		</PackageDescription>
 		<PackageTags>bUnit;razor components;blazor components;unit testing;testing blazor components;blazor server;blazor wasm</PackageTags>
 		<PackageProjectUrl>https://github.com/egil/bunit</PackageProjectUrl>
@@ -30,7 +30,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
diff --git a/src/bunit.testassets/BlazorE2E/CounterComponent.razor b/src/bunit.testassets/BlazorE2E/CounterComponent.razor
index 9de91502e..0b133672d 100644
--- a/src/bunit.testassets/BlazorE2E/CounterComponent.razor
+++ b/src/bunit.testassets/BlazorE2E/CounterComponent.razor
@@ -1,29 +1,40 @@
 <h1>Counter</h1>
 <p>Current count: @currentCount</p>
-<p><button id="counter" @onclick="@(handleClicks ? (Action)IncrementCount : null)">Click me</button></p>
+<p><button id="counter" @onclick="OnClickHandler">Click me</button></p>
 
 <label>
-    <input type="checkbox" @bind="handleClicks" />
-    Toggle click handler registration
+	<input type="checkbox" @bind="handleClicks" />
+	Toggle click handler registration
 </label>
 
 @if (handleClicks)
 {
-    <p id="listening-message">Listening</p>
+	<p id="listening-message">Listening</p>
 }
 
 @code {
-    int currentCount = 0;
-    bool handleClicks = true;
+	private Action OnClickHandler
+	{
+		get
+		{
+			if (handleClicks)
+				return IncrementCount;
+			else
+				return default!;
+		}
+	}
 
-    void IncrementCount()
-    {
-        currentCount++;
-    }
+	int currentCount = 0;
+	bool handleClicks = true;
 
-    public void Reset()
-    {
-        currentCount = 0;
-        StateHasChanged();
-    }
+	void IncrementCount()
+	{
+		currentCount++;
+	}
+
+	public void Reset()
+	{
+		currentCount = 0;
+		StateHasChanged();
+	}
 }
diff --git a/src/bunit.testassets/ExcludeFromCodeCoverage.cs b/src/bunit.testassets/ExcludeFromCodeCoverage.cs
new file mode 100644
index 000000000..99409c7b4
--- /dev/null
+++ b/src/bunit.testassets/ExcludeFromCodeCoverage.cs
@@ -0,0 +1 @@
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage()]
diff --git a/src/bunit.testassets/SampleComponents/Data/ThemeInfo.cs b/src/bunit.testassets/SampleComponents/Data/ThemeInfo.cs
index 08d7b0780..1adff3be1 100644
--- a/src/bunit.testassets/SampleComponents/Data/ThemeInfo.cs
+++ b/src/bunit.testassets/SampleComponents/Data/ThemeInfo.cs
@@ -1,7 +1,7 @@
 namespace Bunit.TestAssets.SampleComponents.Data
 {
 	public class ThemeInfo
-    {
-        public string? Value { get; set; }
-    }
+	{
+		public string? Value { get; set; }
+	}
 }
diff --git a/src/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor b/src/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
index feb6f42ed..050e8f033 100644
--- a/src/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
+++ b/src/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
@@ -27,8 +27,8 @@
 	protected override async Task OnParametersSetAsync()
 	{
 		var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-		userName = state.User.Identity.Name;
-		userEmail = state.User.FindFirst(ClaimTypes.Email)?.Value;
-		userId = state.User.FindFirst(ClaimTypes.Sid)?.Value;
+		userName = state?.User?.Identity?.Name ?? string.Empty;
+		userEmail = state?.User?.FindFirst(ClaimTypes.Email)?.Value;
+		userId = state?.User?.FindFirst(ClaimTypes.Sid)?.Value;
 	}
 }
diff --git a/src/bunit.testassets/SampleComponents/ToggleClickHandler.razor b/src/bunit.testassets/SampleComponents/ToggleClickHandler.razor
index b2af9d9f3..1f87700a3 100644
--- a/src/bunit.testassets/SampleComponents/ToggleClickHandler.razor
+++ b/src/bunit.testassets/SampleComponents/ToggleClickHandler.razor
@@ -1,4 +1,4 @@
-<p><button id="btn" @onclick="@(HandleClicks ? (Action)IncrementCount : null)">Click me</button></p>
+<p><button id="btn" @onclick="@(HandleClicks ? (Action)IncrementCount : default(Action)!)">Click me</button></p>
 
 @code {
     public int Counter { get; set; }
@@ -7,4 +7,4 @@
     public bool HandleClicks { get; set; } = true;
 
     void IncrementCount() { Counter++; }
-}
\ No newline at end of file
+}
diff --git a/src/bunit.testassets/SampleComponents/TriggerTester.cs b/src/bunit.testassets/SampleComponents/TriggerTester.cs
index ac8ac74a9..f3942eb27 100644
--- a/src/bunit.testassets/SampleComponents/TriggerTester.cs
+++ b/src/bunit.testassets/SampleComponents/TriggerTester.cs
@@ -19,7 +19,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 				throw new InvalidOperationException($"{nameof(TriggeredEvent)} is null");
 
 			builder.OpenElement(0, Element);
-			builder.AddAttribute(1, EventName, EventCallback.Factory.Create<TEventArgs>(this, (args) => TriggeredEvent?.InvokeAsync(args)));
+			builder.AddAttribute(1, EventName, EventCallback.Factory.Create(this, TriggeredEvent.Value));
 			builder.CloseElement();
 		}
 	}
diff --git a/src/bunit.testassets/bunit.testassets.csproj b/src/bunit.testassets/bunit.testassets.csproj
index 4b3a4fcf2..6461d7a6b 100644
--- a/src/bunit.testassets/bunit.testassets.csproj
+++ b/src/bunit.testassets/bunit.testassets.csproj
@@ -1,16 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
 		<RazorLangVersion>3.0</RazorLangVersion>
 		<RootNamespace>Bunit.TestAssets</RootNamespace>
 		<AssemblyName>Bunit.TestAssets</AssemblyName>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<PropertyGroup>
+		<!--
+			TODO: Added because of bug in P7: https://github.com/dotnet/aspnetcore/issues/24794				
+		-->
+		<WarningsAsErrors>CS8602;CS8603;CS8625</WarningsAsErrors>
+	</PropertyGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/bunit.web.tests/Assembly.cs b/src/bunit.web.tests/Assembly.cs
index c2a9bc9c5..786c37ff8 100644
--- a/src/bunit.web.tests/Assembly.cs
+++ b/src/bunit.web.tests/Assembly.cs
@@ -1 +1 @@
-[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
\ No newline at end of file
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/src/bunit.web.tests/EventDispatchExtensions/ClipboardEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/ClipboardEventDispatchExtensionsTest.cs
index 0901b5335..9a02b2888 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/ClipboardEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/ClipboardEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/DragEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/DragEventDispatchExtensionsTest.cs
index 3061c4f91..6ae416328 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/DragEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/DragEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/FocusEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/FocusEventDispatchExtensionsTest.cs
index eab520319..030eaf756 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/FocusEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/FocusEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/InputEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/InputEventDispatchExtensionsTest.cs
index a3c4c14b5..5a0b523de 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/InputEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/InputEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/KeyboardEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/KeyboardEventDispatchExtensionsTest.cs
index 8280ffe97..f98a72434 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/KeyboardEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/KeyboardEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/MediaEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/MediaEventDispatchExtensionsTest.cs
index e63d4becb..a6dd85825 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/MediaEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/MediaEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Threading.Tasks;
 
diff --git a/src/bunit.web.tests/EventDispatchExtensions/MouseEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/MouseEventDispatchExtensionsTest.cs
index 4c41b4857..648a617ae 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/MouseEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/MouseEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/PointerEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/PointerEventDispatchExtensionsTest.cs
index 566ecca45..5e0c1cf7f 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/PointerEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/PointerEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/ProgressEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/ProgressEventDispatchExtensionsTest.cs
index 819bfef43..9f310ffb6 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/ProgressEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/ProgressEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Components.Web;
diff --git a/src/bunit.web.tests/EventDispatchExtensions/TouchEventDispatchExtensionsTest.cs b/src/bunit.web.tests/EventDispatchExtensions/TouchEventDispatchExtensionsTest.cs
index 76ef71b7f..b633b2da6 100644
--- a/src/bunit.web.tests/EventDispatchExtensions/TouchEventDispatchExtensionsTest.cs
+++ b/src/bunit.web.tests/EventDispatchExtensions/TouchEventDispatchExtensionsTest.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Threading.Tasks;
 
diff --git a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthenticationStateProviderTest.cs b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthenticationStateProviderTest.cs
index 3550ad9c8..08341bb2f 100644
--- a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthenticationStateProviderTest.cs
+++ b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthenticationStateProviderTest.cs
@@ -19,8 +19,8 @@ public async Task Test001()
 			// assert
 			Assert.NotNull(authState.User);
 			Assert.NotNull(authState.User.Identity);
-			Assert.Equal("TestUser", authState.User.Identity.Name);
-			Assert.True(authState.User.Identity.IsAuthenticated);
+			Assert.Equal("TestUser", authState?.User?.Identity?.Name);
+			Assert.True(authState?.User?.Identity?.IsAuthenticated);
 		}
 
 		[Fact(DisplayName = "Create unauthenticated AuthenticationState")]
@@ -31,10 +31,10 @@ public async Task Test002()
 			var authState = await authProvider.GetAuthenticationStateAsync();
 
 			// assert
-			Assert.NotNull(authState.User);
-			Assert.NotNull(authState.User.Identity);
-			Assert.Null(authState.User.Identity.Name);
-			Assert.False(authState.User.Identity.IsAuthenticated);
+			Assert.NotNull(authState?.User);
+			Assert.NotNull(authState?.User?.Identity);
+			Assert.Null(authState?.User?.Identity?.Name);
+			Assert.False(authState?.User?.Identity?.IsAuthenticated);
 		}
 
 		[Fact(DisplayName = "Switch AuthenticationState from unauthenticated to authenticated.")]
@@ -53,8 +53,8 @@ public async Task Test003()
 			Assert.True(stateChangeHandled);
 			Assert.NotNull(authState.User);
 			Assert.NotNull(authState.User.Identity);
-			Assert.Equal("NewUser", authState.User.Identity.Name);
-			Assert.True(authState.User.Identity.IsAuthenticated);
+			Assert.Equal("NewUser", authState?.User?.Identity?.Name);
+			Assert.True(authState?.User?.Identity?.IsAuthenticated);
 		}
 	}
 }
diff --git a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationPolicyProviderTest.cs b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationPolicyProviderTest.cs
index 479495d85..04ba351fd 100644
--- a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationPolicyProviderTest.cs
+++ b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationPolicyProviderTest.cs
@@ -49,10 +49,10 @@ public async Task Test003()
 
 			// assert
 			Assert.NotNull(policy);
-			Assert.Equal(1, policy.AuthenticationSchemes.Count);
-			Assert.Equal("TestScheme:FooBar", policy.AuthenticationSchemes[0]);
-			Assert.Equal(1, policy.Requirements.Count);
-			Assert.IsType<TestPolicyRequirement>(policy.Requirements[0]);
+			Assert.Equal(1, policy?.AuthenticationSchemes?.Count);
+			Assert.Equal("TestScheme:FooBar", policy?.AuthenticationSchemes?[0]);
+			Assert.Equal(1, policy?.Requirements?.Count);
+			Assert.IsType<TestPolicyRequirement>(policy?.Requirements?[0]);
 		}
 
 		[Fact(DisplayName = "Get policy based on name not in the PolicyProvider.")]
@@ -67,10 +67,10 @@ public async Task Test004()
 
 			// assert
 			Assert.NotNull(policy);
-			Assert.Equal(1, policy.AuthenticationSchemes.Count);
-			Assert.Equal("TestScheme:OtherPolicy", policy.AuthenticationSchemes[0]);
-			Assert.Equal(1, policy.Requirements.Count);
-			Assert.IsType<TestPolicyRequirement>(policy.Requirements[0]);
+			Assert.Equal(1, policy?.AuthenticationSchemes?.Count);
+			Assert.Equal("TestScheme:OtherPolicy", policy?.AuthenticationSchemes?[0]);
+			Assert.Equal(1, policy?.Requirements?.Count);
+			Assert.IsType<TestPolicyRequirement>(policy?.Requirements?[0]);
 		}
 
 		[Fact(DisplayName = "Set Policies with empty scheme name.")]
diff --git a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationServiceTest.cs b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationServiceTest.cs
index bb30e35b1..cb70e4343 100644
--- a/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationServiceTest.cs
+++ b/src/bunit.web.tests/TestDoubles/Authorization/FakeAuthorizationServiceTest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
@@ -62,11 +63,11 @@ public async Task Test005()
 			// arrange
 			using var ctx = new TestContext();
 			var authService = ctx.Services.GetRequiredService<IAuthorizationService>();
-			IEnumerable<IAuthorizationRequirement>? requirements = null;
+			var requirements = Array.Empty<IAuthorizationRequirement>();
 
 			// act
 			var ex = await Assert.ThrowsAsync<MissingFakeAuthorizationException>(() =>
-				authService.AuthorizeAsync(null, string.Empty, requirements));
+				authService.AuthorizeAsync(null!, string.Empty, requirements));
 
 			// assert
 			Assert.Equal("IAuthorizationService", ex.ServiceName);
@@ -81,7 +82,7 @@ public async Task Test006()
 
 			// act
 			var ex = await Assert.ThrowsAsync<MissingFakeAuthorizationException>(() =>
-				authService.AuthorizeAsync(null, string.Empty, "testPolicy"));
+				authService.AuthorizeAsync(default!, string.Empty, "testPolicy"));
 
 			// assert
 			Assert.Equal("IAuthorizationService", ex.ServiceName);
diff --git a/src/bunit.web.tests/TestUtililities/MockingHelpers.cs b/src/bunit.web.tests/TestUtililities/MockingHelpers.cs
index 6de2b8a1a..e6abab895 100644
--- a/src/bunit.web.tests/TestUtililities/MockingHelpers.cs
+++ b/src/bunit.web.tests/TestUtililities/MockingHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 
diff --git a/src/bunit.web.tests/bunit.web.tests.csproj b/src/bunit.web.tests/bunit.web.tests.csproj
index 40e4b791d..cee7777e8 100644
--- a/src/bunit.web.tests/bunit.web.tests.csproj
+++ b/src/bunit.web.tests/bunit.web.tests.csproj
@@ -1,15 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Web.Tests</AssemblyName>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />	
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+	
+	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.14.0" />
 		<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
 		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
@@ -21,9 +32,9 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="1.2.1">
-			<PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="coverlet.msbuild" Version="2.9.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
diff --git a/src/bunit.web/EventDispatchExtensions/ClipboardEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/ClipboardEventDispatchExtensions.cs
index b92ada281..faea871b8 100644
--- a/src/bunit.web/EventDispatchExtensions/ClipboardEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/ClipboardEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 using AngleSharp.Dom;
@@ -63,7 +63,7 @@ public static class ClipboardEventDispatchExtensions
 		/// </summary>
 		/// <param name="element">The element to raise the event on.</param>
 		/// <param name="type">The type of the event.</param>
-		public static void Copy(this IElement element, string? type = default) => _ = CopyAsync(element, new ClipboardEventArgs { Type = type });
+		public static void Copy(this IElement element, string? type = default) => _ = CopyAsync(element, new ClipboardEventArgs { Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@oncopy</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -88,7 +88,7 @@ public static class ClipboardEventDispatchExtensions
 		/// </summary>
 		/// <param name="element">The element to raise the event on.</param>
 		/// <param name="type">The type of the event.</param>
-		public static void Cut(this IElement element, string? type = default) => _ = CutAsync(element, new ClipboardEventArgs { Type = type });
+		public static void Cut(this IElement element, string type = default!) => _ = CutAsync(element, new ClipboardEventArgs { Type = type });
 
 		/// <summary>
 		/// Raises the <c>@oncut</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -113,7 +113,7 @@ public static class ClipboardEventDispatchExtensions
 		/// </summary>
 		/// <param name="element">The element to raise the event on.</param>
 		/// <param name="type">The type of the event.</param>
-		public static void Paste(this IElement element, string? type = default) => _ = PasteAsync(element, new ClipboardEventArgs { Type = type });
+		public static void Paste(this IElement element, string type = default!) => _ = PasteAsync(element, new ClipboardEventArgs { Type = type });
 
 		/// <summary>
 		/// Raises the <c>@onpaste</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/EventDispatchExtensions/DragEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/DragEventDispatchExtensions.cs
index 52d33cc41..d099cb9ca 100644
--- a/src/bunit.web/EventDispatchExtensions/DragEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/DragEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
@@ -40,7 +40,7 @@ public static class DragEventDispatchExtensions
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
-		public static void Drag(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
+		public static void Drag(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string type = default!, DataTransfer dataTransfer = default!)
 			=> _ = DragAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
 
 		/// <summary>
@@ -90,7 +90,7 @@ public static void Drag(this IElement element, long detail = default, double scr
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void DragEnd(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DragEndAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DragEndAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondragend</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -139,7 +139,7 @@ public static void DragEnd(this IElement element, long detail = default, double
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void DragEnter(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DragEnterAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DragEnterAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondragenter</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -188,7 +188,7 @@ public static void DragEnter(this IElement element, long detail = default, doubl
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void DragLeave(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DragLeaveAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DragLeaveAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondragleave</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -237,7 +237,7 @@ public static void DragLeave(this IElement element, long detail = default, doubl
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void DragOver(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DragOverAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DragOverAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondragover</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -286,7 +286,7 @@ public static void DragOver(this IElement element, long detail = default, double
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void DragStart(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DragStartAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DragStartAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondragstart</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -335,7 +335,7 @@ public static void DragStart(this IElement element, long detail = default, doubl
 		/// <param name="type">Gets or sets the type of the event.</param>
 		/// <param name="dataTransfer">The data that underlies a drag-and-drop operation, known as the drag data store. See <see cref="DataTransfer"/>.</param>
 		public static void Drop(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, DataTransfer? dataTransfer = default)
-			=> _ = DropAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DataTransfer = dataTransfer });
+			=> _ = DropAsync(element, new DragEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DataTransfer = dataTransfer! });
 
 		/// <summary>
 		/// Raises the <c>@ondrop</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/EventDispatchExtensions/FocusEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/FocusEventDispatchExtensions.cs
index 0817d9a52..f3065365f 100644
--- a/src/bunit.web/EventDispatchExtensions/FocusEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/FocusEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
diff --git a/src/bunit.web/EventDispatchExtensions/InputEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/InputEventDispatchExtensions.cs
index 1b4bc00a3..ae289ee84 100644
--- a/src/bunit.web/EventDispatchExtensions/InputEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/InputEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 using AngleSharp.Dom;
diff --git a/src/bunit.web/EventDispatchExtensions/KeyboardEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/KeyboardEventDispatchExtensions.cs
index 7a8fdb440..5c5133125 100644
--- a/src/bunit.web/EventDispatchExtensions/KeyboardEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/KeyboardEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
@@ -35,7 +35,7 @@ public static class KeyboardEventDispatchExtensions
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">The type of the event.</param>
 		public static void KeyDown(this IElement element, string key, string? code = default, float location = default, bool repeat = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> KeyDownAsync(element, new KeyboardEventArgs { Key = key, Code = code, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> KeyDownAsync(element, new KeyboardEventArgs { Key = key, Code = code!, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onkeydown</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -78,7 +78,7 @@ public static void KeyDown(this IElement element, string key, string? code = def
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">The type of the event.</param>
 		public static void KeyUp(this IElement element, string key, string? code = default, float location = default, bool repeat = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> KeyUpAsync(element, new KeyboardEventArgs { Key = key, Code = code, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> KeyUpAsync(element, new KeyboardEventArgs { Key = key, Code = code!, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onkeyup</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -121,7 +121,7 @@ public static void KeyUp(this IElement element, string key, string? code = defau
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">The type of the event.</param>
 		public static void KeyPress(this IElement element, string key, string? code = default, float location = default, bool repeat = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> KeyPressAsync(element, new KeyboardEventArgs { Key = key, Code = code, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> KeyPressAsync(element, new KeyboardEventArgs { Key = key, Code = code!, Location = location, Repeat = repeat, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onkeypress</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/EventDispatchExtensions/MediaEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/MediaEventDispatchExtensions.cs
index 56e6d5aa5..5472ba8bb 100644
--- a/src/bunit.web/EventDispatchExtensions/MediaEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/MediaEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 using AngleSharp.Dom;
diff --git a/src/bunit.web/EventDispatchExtensions/MouseEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/MouseEventDispatchExtensions.cs
index 159cac586..848fe98c1 100644
--- a/src/bunit.web/EventDispatchExtensions/MouseEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/MouseEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
@@ -40,7 +40,7 @@ public static class MouseEventDispatchExtensions
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void MouseOver(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = MouseOverAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = MouseOverAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onmouseover</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -89,7 +89,7 @@ public static void MouseOver(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void MouseOut(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = MouseOutAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = MouseOutAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onmouseout</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -138,7 +138,7 @@ public static void MouseOut(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void MouseMove(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = MouseMoveAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = MouseMoveAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onmousemove</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -187,7 +187,7 @@ public static void MouseMove(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void MouseDown(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = MouseDownAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = MouseDownAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onmousedown</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -236,7 +236,7 @@ public static void MouseDown(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void MouseUp(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = MouseUpAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = MouseUpAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onmouseup</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -285,7 +285,7 @@ public static void MouseUp(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Click(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = ClickAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = ClickAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onclick</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -334,7 +334,7 @@ public static void Click(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void DoubleClick(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = DoubleClickAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = DoubleClickAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ondblclick</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -387,7 +387,7 @@ public static void DoubleClick(this IElement element, MouseEventArgs eventArgs)
 		/// <param name="deltaZ">The scroll amount for the z-axis.</param>
 		/// <param name="deltaMode">The unit of the delta values scroll amount.</param>
 		public static void Wheel(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, double deltaX = default, double deltaY = default, double deltaZ = default, long deltaMode = default)
-			=> _ = WheelAsync(element, new WheelEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DeltaX = deltaX, DeltaY = deltaY, DeltaZ = deltaZ, DeltaMode = deltaMode });
+			=> _ = WheelAsync(element, new WheelEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DeltaX = deltaX, DeltaY = deltaY, DeltaZ = deltaZ, DeltaMode = deltaMode });
 
 		/// <summary>
 		/// Raises the <c>@onwheel</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -440,7 +440,7 @@ public static void Wheel(this IElement element, WheelEventArgs eventArgs)
 		/// <param name="deltaZ">The scroll amount for the z-axis.</param>
 		/// <param name="deltaMode">The unit of the delta values scroll amount.</param>
 		public static void MouseWheel(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default, double deltaX = default, double deltaY = default, double deltaZ = default, long deltaMode = default)
-			=> MouseWheelAsync(element, new WheelEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type, DeltaX = deltaX, DeltaY = deltaY, DeltaZ = deltaZ, DeltaMode = deltaMode });
+			=> MouseWheelAsync(element, new WheelEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type!, DeltaX = deltaX, DeltaY = deltaY, DeltaZ = deltaZ, DeltaMode = deltaMode });
 
 		/// <summary>
 		/// Raises the <c>@onmousewheel</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -489,7 +489,7 @@ public static void MouseWheel(this IElement element, WheelEventArgs eventArgs)
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void ContextMenu(this IElement element, long detail = default, double screenX = default, double screenY = default, double clientX = default, double clientY = default, long button = default, long buttons = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = ContextMenuAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = ContextMenuAsync(element, new MouseEventArgs { Detail = detail, ScreenX = screenX, ScreenY = screenY, ClientX = clientX, ClientY = clientY, Button = button, Buttons = buttons, CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@oncontextmenu</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/EventDispatchExtensions/PointerEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/PointerEventDispatchExtensions.cs
index 7960860d3..89506999b 100644
--- a/src/bunit.web/EventDispatchExtensions/PointerEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/PointerEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
@@ -66,14 +66,14 @@ public static void GotPointerCapture(this IElement element, long detail = defaul
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -149,14 +149,14 @@ public static void LostPointerCapture(this IElement element, long detail = defau
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -234,14 +234,14 @@ public static void PointerDown(this IElement element,
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -318,14 +318,14 @@ public static void PointerEnter(this IElement element,
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -402,14 +402,14 @@ public static void PointerLeave(this IElement element,
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -485,14 +485,14 @@ public static void PointerMove(this IElement element, long detail = default, dou
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -568,14 +568,14 @@ public static void PointerOut(this IElement element, long detail = default, doub
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -651,14 +651,14 @@ public static void PointerOver(this IElement element, long detail = default, dou
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
@@ -734,14 +734,14 @@ public static void PointerUp(this IElement element, long detail = default, doubl
 				ShiftKey = shiftKey,
 				AltKey = altKey,
 				MetaKey = metaKey,
-				Type = type,
+				Type = type!,
 				PointerId = pointerId,
 				Width = width,
 				Height = height,
 				Pressure = pressure,
 				TiltX = tiltX,
 				TiltY = tiltY,
-				PointerType = pointerType,
+				PointerType = pointerType!,
 				IsPrimary = isPrimary
 			});
 
diff --git a/src/bunit.web/EventDispatchExtensions/ProgressEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/ProgressEventDispatchExtensions.cs
index 23301ad6b..2c99fbc67 100644
--- a/src/bunit.web/EventDispatchExtensions/ProgressEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/ProgressEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 using AngleSharp.Dom;
 
@@ -21,7 +21,7 @@ public static class ProgressEventDispatchExtensions
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void LoadStart(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = LoadStartAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = LoadStartAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onloadstart</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -50,7 +50,7 @@ public static void LoadStart(this IElement element, bool lengthComputable = defa
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Timeout(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = TimeoutAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = TimeoutAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontimeout</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -79,7 +79,7 @@ public static void Timeout(this IElement element, bool lengthComputable = defaul
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Abort(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = AbortAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = AbortAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onabort</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -108,7 +108,7 @@ public static void Abort(this IElement element, bool lengthComputable = default,
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Load(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = LoadAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = LoadAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onload</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -137,7 +137,7 @@ public static void Load(this IElement element, bool lengthComputable = default,
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void LoadEnd(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = LoadEndAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = LoadEndAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onloadend</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -166,7 +166,7 @@ public static void LoadEnd(this IElement element, bool lengthComputable = defaul
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Progress(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = ProgressAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = ProgressAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onprogress</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -195,7 +195,7 @@ public static void Progress(this IElement element, bool lengthComputable = defau
 		/// <param name="total">The total number of bytes of content that will be transferred during the operation. If the total size is unknown, this value is zero.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void Error(this IElement element, bool lengthComputable = default, long loaded = default, long total = default, string? type = default)
-			=> _ = ErrorAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type });
+			=> _ = ErrorAsync(element, new ProgressEventArgs { LengthComputable = lengthComputable, Loaded = loaded, Total = total, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@onerror</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/EventDispatchExtensions/TouchEventDispatchExtensions.cs b/src/bunit.web/EventDispatchExtensions/TouchEventDispatchExtensions.cs
index bf9f29447..2a062084e 100644
--- a/src/bunit.web/EventDispatchExtensions/TouchEventDispatchExtensions.cs
+++ b/src/bunit.web/EventDispatchExtensions/TouchEventDispatchExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
 using AngleSharp.Dom;
@@ -33,7 +33,7 @@ public static class TouchEventDispatchExtensions
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchCancel(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchCancelAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchCancelAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchcancel</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -75,7 +75,7 @@ public static Task TouchCancelAsync(this IElement element, TouchEventArgs eventA
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchEnd(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchEndAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchEndAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchend</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -117,7 +117,7 @@ public static Task TouchEndAsync(this IElement element, TouchEventArgs eventArgs
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchMove(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchMoveAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchMoveAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchmove</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -159,7 +159,7 @@ public static Task TouchMoveAsync(this IElement element, TouchEventArgs eventArg
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchStart(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchStartAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchStartAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchstart</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -201,7 +201,7 @@ public static Task TouchStartAsync(this IElement element, TouchEventArgs eventAr
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchEnter(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchEnterAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchEnterAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchenter</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
@@ -243,7 +243,7 @@ public static Task TouchEnterAsync(this IElement element, TouchEventArgs eventAr
 		/// <param name="metaKey">true if the meta key was down when the event was fired. false otherwise.</param>
 		/// <param name="type">Gets or sets the type of the event.</param>
 		public static void TouchLeave(this IElement element, long detail = default, TouchPoint[]? touches = default, TouchPoint[]? targetTouches = default, TouchPoint[]? changedTouches = default, bool ctrlKey = default, bool shiftKey = default, bool altKey = default, bool metaKey = default, string? type = default)
-			=> _ = TouchLeaveAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type });
+			=> _ = TouchLeaveAsync(element, new TouchEventArgs { Detail = detail, Touches = touches ?? Array.Empty<TouchPoint>(), TargetTouches = targetTouches ?? Array.Empty<TouchPoint>(), ChangedTouches = changedTouches ?? Array.Empty<TouchPoint>(), CtrlKey = ctrlKey, ShiftKey = shiftKey, AltKey = altKey, MetaKey = metaKey, Type = type! });
 
 		/// <summary>
 		/// Raises the <c>@ontouchleave</c> event on <paramref name="element"/>, passing the provided <paramref name="eventArgs"/>
diff --git a/src/bunit.web/Extensions/ElementNotFoundException.cs b/src/bunit.web/Extensions/ElementNotFoundException.cs
index 31d5ac576..b63d6bc2e 100644
--- a/src/bunit.web/Extensions/ElementNotFoundException.cs
+++ b/src/bunit.web/Extensions/ElementNotFoundException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Bunit
 {
diff --git a/src/bunit.web/Extensions/ElementRemovedException.cs b/src/bunit.web/Extensions/ElementRemovedException.cs
index 60e851a2b..873c778f9 100644
--- a/src/bunit.web/Extensions/ElementRemovedException.cs
+++ b/src/bunit.web/Extensions/ElementRemovedException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Bunit
diff --git a/src/bunit.web/Extensions/IRefreshableElementCollection.cs b/src/bunit.web/Extensions/IRefreshableElementCollection.cs
index f9b9ccd48..8eb1f92a0 100644
--- a/src/bunit.web/Extensions/IRefreshableElementCollection.cs
+++ b/src/bunit.web/Extensions/IRefreshableElementCollection.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 using AngleSharp.Dom;
 
diff --git a/src/bunit.web/Extensions/Internal/AngleSharpExtensions.cs b/src/bunit.web/Extensions/Internal/AngleSharpExtensions.cs
index 5ff3852ce..d17dac240 100644
--- a/src/bunit.web/Extensions/Internal/AngleSharpExtensions.cs
+++ b/src/bunit.web/Extensions/Internal/AngleSharpExtensions.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 using AngleSharp.Dom;
 
diff --git a/src/bunit.web/RazorTesting/Fixture.cs b/src/bunit.web/RazorTesting/Fixture.cs
index 01e055104..5597f666c 100644
--- a/src/bunit.web/RazorTesting/Fixture.cs
+++ b/src/bunit.web/RazorTesting/Fixture.cs
@@ -22,7 +22,7 @@ private IReadOnlyList<FragmentBase> TestData
 			{
 				if (_testData is null)
 				{
-					var id = Renderer.RenderFragment(ChildContent);
+					var id = Renderer.RenderFragment(ChildContent!);
 					_testData = Renderer.FindComponents<FragmentBase>(id).Select(x => x.Component).ToArray();
 				}
 				return _testData;
diff --git a/src/bunit.web/RazorTesting/SnapshotTest.cs b/src/bunit.web/RazorTesting/SnapshotTest.cs
index 2d04bec7f..8c78f304e 100644
--- a/src/bunit.web/RazorTesting/SnapshotTest.cs
+++ b/src/bunit.web/RazorTesting/SnapshotTest.cs
@@ -34,12 +34,12 @@ public class SnapshotTest : RazorTestBase
 		/// <summary>
 		/// Gets or sets the input to the snapshot test.
 		/// </summary>
-		[Parameter] public RenderFragment TestInput { get; set; } = default!;
+		[Parameter] public RenderFragment? TestInput { get; set; }
 
 		/// <summary>
 		/// Gets or sets the expected output of the snapshot test.
 		/// </summary>
-		[Parameter] public RenderFragment ExpectedOutput { get; set; } = default!;
+		[Parameter] public RenderFragment? ExpectedOutput { get; set; }
 
 		/// <inheritdoc/>
 		protected override async Task Run()
@@ -53,10 +53,10 @@ protected override async Task Run()
 			if (SetupAsync is { })
 				await TryRunAsync(SetupAsync, this).ConfigureAwait(false);
 
-			var testRenderId = Renderer.RenderFragment(TestInput);
+			var testRenderId = Renderer.RenderFragment(TestInput!);
 			var inputHtml = Htmlizer.GetHtml(Renderer, testRenderId);
 
-			var expectedRenderId = Renderer.RenderFragment(ExpectedOutput);
+			var expectedRenderId = Renderer.RenderFragment(ExpectedOutput!);
 			var expectedHtml = Htmlizer.GetHtml(Renderer, expectedRenderId);
 
 			VerifySnapshot(inputHtml, expectedHtml);
diff --git a/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationPolicyProvider.cs b/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationPolicyProvider.cs
index 186d7d47a..2773c9dee 100644
--- a/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationPolicyProvider.cs
+++ b/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationPolicyProvider.cs
@@ -24,15 +24,15 @@ public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
 		/// Gets the fallback authorization policy.
 		/// </summary>
 		/// <returns>Fallback policy.</returns>
-		public Task<AuthorizationPolicy> GetFallbackPolicyAsync()
-			=> Task.FromResult(_options.FallbackPolicy);
+		public Task<AuthorizationPolicy?> GetFallbackPolicyAsync()
+			=> Task.FromResult<AuthorizationPolicy?>(_options.FallbackPolicy);
 
 		/// <summary>
 		/// Get the current policy, which in this implementation just returns a test policy.
 		/// </summary>
 		/// <param name="policyName">Policy name.</param>
 		/// <returns>Test policy for the specified name.</returns>
-		public Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+		public Task<AuthorizationPolicy?> GetPolicyAsync(string policyName)
 		{
 			var authPolicy = new AuthorizationPolicy(new[]
 			{
@@ -40,7 +40,7 @@ public Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
 			},
 			new[] { $"{_policySchemeName}:{policyName}" });
 
-			return Task.FromResult(authPolicy);
+			return Task.FromResult<AuthorizationPolicy?>(authPolicy);
 		}
 
 		/// <summary>
diff --git a/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationService.cs b/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationService.cs
index 28d0ab4d1..fa853fa11 100644
--- a/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationService.cs
+++ b/src/bunit.web/TestDoubles/Authorization/FakeAuthorizationService.cs
@@ -3,6 +3,9 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+
+using Bunit.Extensions;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Infrastructure;
 
@@ -62,9 +65,10 @@ public void SetRoles(IEnumerable<string> roles)
 		/// <param name="resource">Resource being authorized.</param>
 		/// <param name="requirements">Authorization requirements.</param>
 		/// <returns>Result of authorize request.</returns>
-		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable<IAuthorizationRequirement> requirements)
+		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements)
 		{
-			_ = requirements ?? throw new ArgumentNullException(nameof(requirements));
+			if (requirements is null)
+				throw new ArgumentNullException(nameof(requirements));
 
 			AuthorizationResult result;
 
@@ -72,7 +76,7 @@ public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object res
 			{
 				result = (_currentState == AuthorizationState.Authorized) ? AuthorizationResult.Success() : AuthorizationResult.Failed();
 			}
-			else if (requirements.All( p => p is RolesAuthorizationRequirement))
+			else if (requirements.All(p => p is RolesAuthorizationRequirement))
 			{
 				result = VerifyRequiredRoles(requirements);
 			}
@@ -95,7 +99,7 @@ public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object res
 		/// <param name="resource">Resource being authorized.</param>
 		/// <param name="policyName">Policy to use for authorization.</param>
 		/// <returns>Result of authorize request.</returns>
-		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName)
+		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName)
 		{
 			var requirements = new List<IAuthorizationRequirement>
 			{
@@ -107,20 +111,23 @@ public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object res
 
 		private AuthorizationResult VerifyRequiredPolicies(IEnumerable<IAuthorizationRequirement> requirements)
 		{
-			AuthorizationResult result = AuthorizationResult.Failed();
+			if (_supportedPolicies.IsNullOrEmpty() || requirements.IsNullOrEmpty())
+			{
+				return AuthorizationResult.Failed();
+			}
+
 			foreach (IAuthorizationRequirement req in requirements)
 			{
 				if (req is TestPolicyRequirement testReq)
 				{
 					if (_supportedPolicies.Contains(testReq.PolicyName))
 					{
-						result = AuthorizationResult.Success();
-						break;
+						return AuthorizationResult.Success();
 					}
 				}
 			}
 
-			return result;
+			return AuthorizationResult.Failed();
 		}
 
 		private AuthorizationResult VerifyRequiredRoles(IEnumerable<IAuthorizationRequirement> requirements)
diff --git a/src/bunit.web/TestDoubles/Authorization/PlaceholderAuthorizationService.cs b/src/bunit.web/TestDoubles/Authorization/PlaceholderAuthorizationService.cs
index 1f19df6eb..2eca619b0 100644
--- a/src/bunit.web/TestDoubles/Authorization/PlaceholderAuthorizationService.cs
+++ b/src/bunit.web/TestDoubles/Authorization/PlaceholderAuthorizationService.cs
@@ -7,12 +7,12 @@ namespace Bunit.TestDoubles.Authorization
 {
 	internal class PlaceholderAuthorizationService : IAuthorizationService
 	{
-		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, IEnumerable<IAuthorizationRequirement> requirements)
+		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, IEnumerable<IAuthorizationRequirement> requirements)
 		{
 			throw new MissingFakeAuthorizationException(nameof(IAuthorizationService));
 		}
 
-		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName)
+		public Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal user, object? resource, string policyName)
 		{
 			throw new MissingFakeAuthorizationException(nameof(IAuthorizationService));
 		}
diff --git a/src/bunit.web/TestDoubles/JSInterop/JSRuntimeInvocation.cs b/src/bunit.web/TestDoubles/JSInterop/JSRuntimeInvocation.cs
index 222d19cad..7693227d6 100644
--- a/src/bunit.web/TestDoubles/JSInterop/JSRuntimeInvocation.cs
+++ b/src/bunit.web/TestDoubles/JSInterop/JSRuntimeInvocation.cs
@@ -44,7 +44,7 @@ public bool Equals(JSRuntimeInvocation other)
 			&& ArgumentsEqual(Arguments, other.Arguments);
 
 		/// <inheritdoc/>
-		public override bool Equals(object obj) => obj is JSRuntimeInvocation other && Equals(other);
+		public override bool Equals(object? obj) => obj is JSRuntimeInvocation other && Equals(other);
 
 		/// <inheritdoc/>
 		public override int GetHashCode()
diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj
index 9fae78899..bb095b3ff 100644
--- a/src/bunit.web/bunit.web.csproj
+++ b/src/bunit.web/bunit.web.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
 		<RazorLangVersion>3.0</RazorLangVersion>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<RootNamespace>Bunit</RootNamespace>
@@ -35,20 +35,30 @@
 		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="AngleSharp" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Wrappers" Version="1.2.0" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
 		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AngleSharp" Version="0.14.0" />
+		<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
+		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
+		<PackageReference Include="AngleSharp.Wrappers" Version="1.2.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
diff --git a/src/bunit.xunit.tests/RazorTesting/Mocks.cs b/src/bunit.xunit.tests/RazorTesting/Mocks.cs
index bad63180d..ab60e9a79 100644
--- a/src/bunit.xunit.tests/RazorTesting/Mocks.cs
+++ b/src/bunit.xunit.tests/RazorTesting/Mocks.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 
 using Xunit.Abstractions;
diff --git a/src/bunit.xunit.tests/SampleComponents/ZeroFixtureComponent.cs b/src/bunit.xunit.tests/SampleComponents/ZeroFixtureComponent.cs
index 4224cb116..7fa812370 100644
--- a/src/bunit.xunit.tests/SampleComponents/ZeroFixtureComponent.cs
+++ b/src/bunit.xunit.tests/SampleComponents/ZeroFixtureComponent.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.Rendering;
 
 namespace Bunit.SampleComponents
 {
diff --git a/src/bunit.xunit.tests/bunit.xunit.tests.csproj b/src/bunit.xunit.tests/bunit.xunit.tests.csproj
index 4940e6fbc..9cc958b00 100644
--- a/src/bunit.xunit.tests/bunit.xunit.tests.csproj
+++ b/src/bunit.xunit.tests/bunit.xunit.tests.csproj
@@ -1,15 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Xunit.Tests</AssemblyName>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
 		<PackageReference Include="Moq" Version="4.14.1" />
@@ -22,9 +34,9 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="1.2.1">
-			<PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="coverlet.msbuild" Version="2.9.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
diff --git a/src/bunit.xunit/Asserting/CollectionAssertExtensions.cs b/src/bunit.xunit/Asserting/CollectionAssertExtensions.cs
index 3c9f800ca..e4574c27d 100644
--- a/src/bunit.xunit/Asserting/CollectionAssertExtensions.cs
+++ b/src/bunit.xunit/Asserting/CollectionAssertExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/bunit.xunit/Xunit.Sdk/RazorTestCase.cs b/src/bunit.xunit/Xunit.Sdk/RazorTestCase.cs
index 302bdd4c4..145bb2ec6 100644
--- a/src/bunit.xunit/Xunit.Sdk/RazorTestCase.cs
+++ b/src/bunit.xunit/Xunit.Sdk/RazorTestCase.cs
@@ -118,9 +118,9 @@ private string GetUniqueID(ITestMethod testMethod)
 			{
 				var assemblyName = testMethod.TestClass.TestCollection.TestAssembly.Assembly.Name;
 
-				//Get just the assembly name (without version info) when obtained by reflection
+				// Get just the assembly name (without version info) when obtained by reflection
 				if (testMethod.TestClass.TestCollection.TestAssembly.Assembly is IReflectionAssemblyInfo assembly)
-					assemblyName = assembly.Assembly.GetName().Name;
+					assemblyName = assembly.Assembly.GetName().Name ?? string.Empty;
 
 				Write(stream, assemblyName);
 				Write(stream, testMethod.TestClass.Class.Name);
diff --git a/src/bunit.xunit/Xunit.Sdk/RazorTestSourceInformationProvider.cs b/src/bunit.xunit/Xunit.Sdk/RazorTestSourceInformationProvider.cs
index ed8498d6d..6ff809519 100644
--- a/src/bunit.xunit/Xunit.Sdk/RazorTestSourceInformationProvider.cs
+++ b/src/bunit.xunit/Xunit.Sdk/RazorTestSourceInformationProvider.cs
@@ -22,7 +22,8 @@ private static IEnumerable<Type> GetRazorTestTypes()
 			var razorTestBaseType = typeof(RazorTestBase);
 			foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
 			{
-				if (!a.FullName.StartsWith("Bunit", StringComparison.Ordinal))
+				var name = a.FullName ?? string.Empty;
+				if (!name.StartsWith("Bunit", StringComparison.Ordinal))
 					continue;
 
 				foreach (Type t in a.ExportedTypes)
@@ -67,7 +68,7 @@ public RazorTestSourceInformationProvider(IMessageSink? diagnosticMessageSink =
 			return null;
 		}
 
-		private bool TryFindSourceFile(Type testComponent, [NotNullWhen(true)]out string? razorFile)
+		private bool TryFindSourceFile(Type testComponent, [NotNullWhen(true)] out string? razorFile)
 		{
 			var sourceFileFinder = GetSourceFileFinderForType(testComponent);
 
@@ -89,7 +90,7 @@ private bool TryFindSourceFile(Type testComponent, [NotNullWhen(true)]out string
 
 			return razorFile is { };
 		}
-		
+
 		private SourceFileFinder GetSourceFileFinderForType(Type testComponent)
 		{
 			if (_sourceFileFinder is null || _sourceFileFinder.SearchAssembly != testComponent.Assembly)
@@ -116,7 +117,7 @@ private static bool IsGeneratedTestComponentFile(Type testComponent, string file
 				&& IsTestComponentFile(testComponent, file.Substring(0, file.Length - GENERATED_FILE_EXTENSION.Length));
 		}
 
-		private static bool TryGetRazorFileFromGeneratedFile(string file, [NotNullWhen(true)]out string? result)
+		private static bool TryGetRazorFileFromGeneratedFile(string file, [NotNullWhen(true)] out string? result)
 		{
 			// Pattern for first line in generated files: #pragma checksum "C:\...\bunit\src\bunit.xunit.tests\SampleComponents\ComponentWithTwoTests.razor" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b0aa9328840c75d34f073c3300621046639ea9c7"
 			const string GENERATED_FILE_REF_PREFIX = "#pragma checksum \"";
@@ -127,7 +128,7 @@ private static bool TryGetRazorFileFromGeneratedFile(string file, [NotNullWhen(t
 			if (line.StartsWith(GENERATED_FILE_REF_PREFIX, StringComparison.Ordinal))
 			{
 				var refFileEndIndex = line.IndexOf('"', GENERATED_FILE_REF_PREFIX.Length);
-				result = line.Substring(GENERATED_FILE_REF_PREFIX.Length, refFileEndIndex - GENERATED_FILE_REF_PREFIX.Length);
+				result = line[GENERATED_FILE_REF_PREFIX.Length..refFileEndIndex];
 			}
 
 			return result is { };
diff --git a/src/bunit.xunit/bunit.xunit.csproj b/src/bunit.xunit/bunit.xunit.csproj
index 29fb83a29..a0d687195 100644
--- a/src/bunit.xunit/bunit.xunit.csproj
+++ b/src/bunit.xunit/bunit.xunit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<RootNamespace>Bunit.Xunit</RootNamespace>
 		<AssemblyName>Bunit.Xunit</AssemblyName>
@@ -32,18 +32,26 @@
 		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="SourceFileFinder" Version="1.0.0-preview-1" />
 		<PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
 		<PackageReference Include="xunit.assert" Version="2.4.0" />
 		<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
 		<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
diff --git a/src/bunit/bunit.csproj b/src/bunit/bunit.csproj
index 980f8eac4..20243c733 100644
--- a/src/bunit/bunit.csproj
+++ b/src/bunit/bunit.csproj
@@ -1,42 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <PackageId>bunit</PackageId>
-    <Title>bUnit</Title>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/egil/bunit</RepositoryUrl>
-    <PackageProjectUrl>https://bunit.egilhansen.com</PackageProjectUrl>
-    <PackageTags>bUnit;razor components;blazor components;unit testing;testing blazor components;blazor server;blazor wasm</PackageTags>
-    <Authors>Egil Hansen</Authors>
-    <Company>Egil Hansen</Company>
-    <Product>bUnit</Product>
-    <Description>bUnit is a testing library for Blazor components.
-
-You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can interact with and inspect the component under test, trigger event handlers, provide cascading values, inject services, mock JavaScript interopt, and perform snapshot testing.
-
-NOTE: This version includes support for xUnit as the general-purpose test framework. In other words, installing this package is equivalent to installing the packages "bunit.core", "bunit.web", and "bunit.xunit".
-
-If you prefer Nunit or MSTest, just install the “bunit.core” and “bunit.web” packages.
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<NoBuild>true</NoBuild>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<PackageId>bunit</PackageId>
+		<Title>bUnit</Title>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryUrl>https://github.com/egil/bunit</RepositoryUrl>
+		<PackageProjectUrl>https://bunit.egilhansen.com</PackageProjectUrl>
+		<PackageTags>bUnit;razor components;blazor components;unit testing;testing blazor components;blazor server;blazor wasm</PackageTags>
+		<Authors>Egil Hansen</Authors>
+		<Company>Egil Hansen</Company>
+		<Product>bUnit</Product>
+		<Description>
+			bUnit is a testing library for Blazor components.
+
+			You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can interact with and inspect the component under test, trigger event handlers, provide cascading values, inject services, mock JavaScript interopt, and perform snapshot testing.
+
+			NOTE: This version includes support for xUnit as the general-purpose test framework. In other words, installing this package is equivalent to installing the packages "bunit.core", "bunit.web", and "bunit.xunit".
+
+			If you prefer Nunit or MSTest, just install the “bunit.core” and “bunit.web” packages.
 		</Description>
-  </PropertyGroup>
+	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\bunit.core\bunit.core.csproj" />
-    <ProjectReference Include="..\bunit.web\bunit.web.csproj" />
-    <ProjectReference Include="..\bunit.xunit\bunit.xunit.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\bunit.core\bunit.core.csproj" />
+		<ProjectReference Include="..\bunit.web\bunit.web.csproj" />
+		<ProjectReference Include="..\bunit.xunit\bunit.xunit.csproj" />
+	</ItemGroup>
 
 </Project>