diff --git a/.github/workflows/AHMC-CI.yml b/.github/workflows/CI.yml
similarity index 73%
rename from .github/workflows/AHMC-CI.yml
rename to .github/workflows/CI.yml
index 631dc273..ecb2e7d0 100644
--- a/.github/workflows/AHMC-CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,4 +1,4 @@
-name: AdvancedHMC-CI
+name: CI
 
 on:
   push:
@@ -13,8 +13,7 @@ jobs:
     strategy:
       matrix:
         version:
-          - '1.0'
-          - '1'
+          - '1.3'
           - 'nightly'
         os:
           - ubuntu-latest
@@ -24,8 +23,12 @@ jobs:
           - x86
           - x64
         exclude:
+          - os: ubuntu-latest
+            arch: x86
           - os: macOS-latest
             arch: x86
+          - os: windows-latest
+            arch: x86
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -33,4 +36,7 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/julia-buildpkg@latest
-      - uses: julia-actions/julia-runtest@latest
+      - name: Run tests
+        uses: julia-actions/julia-runtest@latest
+        env:
+          GEWEKE_TEST: 1
diff --git a/.gitignore b/.gitignore
index 7c6b39fa..8f59501f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vscode
+.history
 Manifest.toml
 test/Project.toml
diff --git a/Project.toml b/Project.toml
index 6aa1a756..d2d92c74 100644
--- a/Project.toml
+++ b/Project.toml
@@ -31,11 +31,13 @@ Bijectors = "76274a88-744f-5084-9051-94815aaf08c4"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+MCMCDebugging = "6d524b87-5f90-4494-b601-374a5b87a94b"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Distributed", "Distributions", "ForwardDiff", "Test", "Turing", "UnicodePlots", "Bijectors", "OrdinaryDiffEq", "Zygote"]
+test = ["Distributed", "Distributions", "ForwardDiff", "Plots", "MCMCDebugging", "Test", "Turing", "UnicodePlots", "Bijectors", "OrdinaryDiffEq", "Zygote"]
diff --git a/test/common.jl b/test/common.jl
index b71a9656..9c3d6fa2 100644
--- a/test/common.jl
+++ b/test/common.jl
@@ -70,3 +70,42 @@ function ℓπ_gdemo(θ)
     loglikelihood = logpdf(Normal(m, sqrt(s)), 1.5) + logpdf(Normal(m, sqrt(s)), 2.0)
     return logprior + loglikelihood
 end
+
+using Distributions: MvNormal
+import Turing
+
+Turing.@model function mvntest(θ, x)
+    θ ~ MvNormal(zeros(D), 2)
+    x ~ Normal(sum(θ), 1)
+    return θ, x
+end
+
+function get_primitives(x, modelgen)
+    spl_prior = Turing.SampleFromPrior()
+    function ℓπ(θ)
+        vi = Turing.VarInfo(model)
+        vi[spl_prior] = θ
+        model(vi, spl_prior)
+        Turing.getlogp(vi)
+    end
+    adbackend = Turing.Core.ForwardDiffAD{40}
+    alg_ad = Turing.HMC{adbackend}(0.1, 1)
+    model = modelgen(missing, x)
+    vi = Turing.VarInfo(model)
+    spl = Turing.Sampler(alg_ad, model)
+    Turing.Core.link!(vi, spl)
+    ∂ℓπ∂θ = θ -> Turing.Core.gradient_logp(adbackend(), θ, vi, model, spl)
+    θ₀ = Turing.VarInfo(model)[Turing.SampleFromPrior()]
+    return ℓπ, ∂ℓπ∂θ, θ₀
+end
+
+function rand_θ_given(x, modelgen, metric, τ; n_samples=20)
+    ℓπ, ∂ℓπ∂θ, θ₀ = get_primitives(x, modelgen)
+    h = Hamiltonian(metric, ℓπ, ∂ℓπ∂θ)
+    samples, stats = sample(h, τ, θ₀, n_samples; verbose=false, progress=false)
+    s = samples[end]
+    return length(s) == 1 ? s[1] : s
+end
+
+# Test function
+g(θ, x) = cat(θ, x; dims=1)
diff --git a/test/runtests.jl b/test/runtests.jl
index 913bfcbc..dcfdd2e9 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,5 +1,8 @@
 using Distributed, Test
 
+println("Envronment variables for testing")
+println(ENV)
+
 @testset "AdvancedHMC" begin
     tests = [
         "metric",
diff --git a/test/sampler.jl b/test/sampler.jl
index 8da91b08..78022085 100644
--- a/test/sampler.jl
+++ b/test/sampler.jl
@@ -1,9 +1,10 @@
 # Allow pass --progress when running this script individually to turn on progress meter
 const PROGRESS = length(ARGS) > 0 && ARGS[1] == "--progress" ? true : false
 
-using Test, AdvancedHMC, LinearAlgebra, Random
+using Test, AdvancedHMC, LinearAlgebra, Random, MCMCDebugging, Plots
 using Parameters: reconstruct
 using Statistics: mean, var, cov
+unicodeplots()
 include("common.jl")
 
 θ_init = rand(MersenneTwister(1), D)
@@ -59,6 +60,12 @@ end
                     Random.seed!(1)
                     samples, stats = sample(h, τ, θ_init, n_samples; verbose=false, progress=PROGRESS)
                     @test mean(samples[n_adapts+1:end]) ≈ zeros(D) atol=RNDATOL
+                    if "GEWEKE_TEST" in keys(ENV) && ENV["GEWEKE_TEST"] == "1"
+                        res = perform(GewekeTest(5_000), mvntest, x -> rand_θ_given(x, mvntest, metric, τ), g; progress=false)
+                        p = plot(res, mvntest)
+                        display(p)
+                        println()
+                    end
                 end
 
                 # Skip adaptation tests with tempering