diff --git a/src/Tests/Aardvark.Rendering.Tests/Program.fs b/src/Tests/Aardvark.Rendering.Tests/Program.fs
index ad32697f..a87cc918 100644
--- a/src/Tests/Aardvark.Rendering.Tests/Program.fs
+++ b/src/Tests/Aardvark.Rendering.Tests/Program.fs
@@ -8,6 +8,7 @@ open FSharp.Data.Adaptive
 open Aardvark.Rendering
 open Aardvark.Rendering.GL
 open OpenTK.Graphics.OpenGL4
+open Aardvark.Application
 open Aardvark.Application.Slim
 
 open BenchmarkDotNet.Running;
@@ -15,6 +16,8 @@ open BenchmarkDotNet.Configs
 open BenchmarkDotNet.Jobs
 open BenchmarkDotNet.Toolchains
 
+open Expecto
+
 let testCompile() =
     use runtime = new Runtime(DebugLevel.None)
     let ctx = new Context(runtime, fun () -> ContextHandleOpenTK.create runtime.DebugConfig)
@@ -242,10 +245,69 @@ module CSTest =
         dst.Download(img)
         img.SaveImageSharp @"C:\Users\Schorsch\Desktop\bla.png"
 
-
-
 [<EntryPoint>]
 let main argv =
+
+    let backendTests backend =
+        let bufferTests =
+            testBackend backend "Buffers" [
+                Buffer.BufferCopy.tests
+                Buffer.BufferUpload.tests
+                Buffer.BufferDownload.tests
+                Buffer.AttributeBuffer.tests
+            ]
+
+        let textureTests =
+            testBackend backend "Textures" [
+                Texture.TextureUpload.tests
+                Texture.TextureDownload.tests
+                Texture.TextureCreate.tests
+                Texture.TextureCopy.tests
+                Texture.TextureClear.tests
+            ]
+
+        let renderingTests =
+            testBackend backend "Rendering" [
+                Rendering.Culling.tests
+                Rendering.RenderTasks.tests
+                Rendering.FramebufferSignature.tests
+                Rendering.IntegerAttachments.tests
+                Rendering.Samplers.tests
+                Rendering.Uniforms.tests
+            ]
+
+        let computeTests =
+            testBackend backend "Compute" [
+                Rendering.ComputeImages.tests
+                Rendering.ComputeBuffers.tests
+                Rendering.ComputePrimitives.tests
+                Rendering.ComputeSorting.tests
+                Rendering.ComputeJpeg.tests
+                Rendering.MutableInputBinding.tests
+            ]
+        testList $"Tests ({backend})" [
+            bufferTests
+            textureTests
+            renderingTests
+            computeTests
+        ]
+
+    let otherTests =
+        testList "Other tests" [
+            ``SceneGraph Tests``.tests
+            ``CompactSet Tests``.tests
+            ``AdaptiveResource Tests``.tests
+        ]
+
+    let allTests =
+        testList "Tests" [
+            otherTests
+            backendTests Backend.GL
+            backendTests Backend.Vulkan
+        ]
+
+    runTestsWithCLIArgs [ CLIArguments.No_Spinner ] argv allTests
+
     //Aardvark.Init()
     //CSTest.run()
 
@@ -264,7 +326,7 @@ let main argv =
     //testDownloadSlice()
     //testCopySlice()
 
-    BenchmarkRunner.Run<StatsBench.StatsTest>() |> ignore
+    // BenchmarkRunner.Run<StatsBench.StatsTest>() |> ignore
 
 
     //testTextureCubeArray()
@@ -278,4 +340,4 @@ let main argv =
     //PerformanceTests.StartupPerformance.runConsole args
     //PerformanceTests.IsActiveFlagPerformance.run args
     //UseTest.bla()
-    0
+    // 0
diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Application.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Application.fs
index 16d0f8a3..f06e6eba 100644
--- a/src/Tests/Aardvark.Rendering.Tests/Tests/Application.fs
+++ b/src/Tests/Aardvark.Rendering.Tests/Tests/Application.fs
@@ -59,9 +59,9 @@ module TestApplication =
                 runtime,
                 { new IDisposable with
                     member x.Dispose() =
-                        checkForDebugErrors()
                         checkForErrors()
                         runtime.Dispose()
+                        checkForDebugErrors()
                         toolkit.Dispose()
                 }
             )
@@ -70,6 +70,7 @@ module TestApplication =
         open Aardvark.Rendering.Vulkan
 
         let create (debug : IDebugConfig) =
+            CustomDeviceChooser.Register Seq.head
             let app = new HeadlessVulkanApplication(debug)
             let onExit =
                 { new IDisposable with
diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Common.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Common.fs
index 6b9ab79c..9aae94c1 100644
--- a/src/Tests/Aardvark.Rendering.Tests/Tests/Common.fs
+++ b/src/Tests/Aardvark.Rendering.Tests/Tests/Common.fs
@@ -22,6 +22,7 @@ module ``Unit Test Utilities`` =
     let prepareCases (backend : Backend) (name : string) (cases : List<string * (IRuntime -> unit)>) =
         cases |> List.map (fun (name, test) ->
             testCase name (fun () -> TestApplication.createUse test backend)
+            |> testSequenced
         )
         |> testList name
 
@@ -32,5 +33,6 @@ module ``Unit Test Utilities`` =
                 Aardvark.Init()
                 test()
             )
+            |> testSequenced
         )
         |> testList name
\ No newline at end of file