diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
deleted file mode 100644
index 3885a43..0000000
--- a/.github/workflows/CI.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - main
-    tags: ['*']
-  pull_request:
-  workflow_dispatch:
-concurrency:
-  # Skip intermediate builds: always.
-  # Cancel intermediate builds: only if it is a pull request build.
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-jobs:
-  test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
-      actions: write
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-          # - 'lts' # TODO: Reenable once dependencies get registered.
-          - '1'
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        arch:
-          - x64
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - uses: julia-actions/cache@v2
-      - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v5
-        with:
-          files: lcov.info
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created
-      contents: write
-      statuses: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: '1'
-      - uses: julia-actions/cache@v2
-      - name: Configure doc environment
-        shell: julia --project=docs --color=yes {0}
-        run: |
-          using Pkg
-          Pkg.develop(PackageSpec(path=pwd()))
-          Pkg.instantiate()
-      - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-docdeploy@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
-      - name: Run doctests
-        shell: julia --project=docs --color=yes {0}
-        run: |
-          using Documenter: DocMeta, doctest
-          using TensorAlgebra
-          DocMeta.setdocmeta!(TensorAlgebra, :DocTestSetup, :(using TensorAlgebra); recursive=true)
-          doctest(TensorAlgebra)
diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
new file mode 100644
index 0000000..01a7f7a
--- /dev/null
+++ b/.github/workflows/Documentation.yml
@@ -0,0 +1,23 @@
+name: "Documentation"
+
+on:
+  push:
+    branches:
+      - main
+    tags: '*'
+  pull_request:
+  schedule:
+    - cron: '1 4 * * 4'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch || github.ref != 'refs/tags/v*' }}
+
+jobs:
+  build-and-deploy-docs:
+    name: "Documentation"
+    uses: "ITensor/ITensorActions/.github/workflows/Documentation.yml@main"
+    with:
+      localregistry: https://github.com/ITensor/ITensorRegistry.git
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml
index bb6d933..3f78afc 100644
--- a/.github/workflows/FormatCheck.yml
+++ b/.github/workflows/FormatCheck.yml
@@ -1,35 +1,13 @@
-name: Format check
+name: "Format Check"
+
 on:
   push:
-    branches: [main]
-    tags: [v*]
+    branches:
+      - 'main'
+    tags: '*'
   pull_request:
 
 jobs:
-  format:
+  format-check:
     name: "Format Check"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: 1
-      - name: Install JuliaFormatter and format
-        run: |
-          julia  -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
-          julia  -e 'using JuliaFormatter; format(".", verbose=true)'
-      - name: Check format
-        run: |
-          julia -e '
-          out = Cmd(`git diff --name-only`) |> read |> String
-          if out == ""
-              exit(0)
-          else
-              @error "The following files have not been formatted:"
-              write(stdout, out)
-              out_diff = Cmd(`git diff`) |> read |> String
-              @error "Diff:"
-              write(stdout, out_diff)
-              exit(1)
-              @error ""
-          end'
+    uses: "ITensor/ITensorActions/.github/workflows/FormatCheck.yml@main"
diff --git a/.github/workflows/LiterateCheck.yml b/.github/workflows/LiterateCheck.yml
index ade2453..2ca5f27 100644
--- a/.github/workflows/LiterateCheck.yml
+++ b/.github/workflows/LiterateCheck.yml
@@ -1,39 +1,15 @@
-name: Literate check
+name: "Literate Check"
+
 on:
   push:
-    branches: [main]
-    tags: [v*]
+    branches:
+      - 'main'
+    tags: '*'
   pull_request:
 
 jobs:
   literate:
     name: "Literate Check"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v2
-        with:
-          version: 1
-      - name: Install Literate and generate docs
-        run: |
-          julia  -e '
-          using Pkg
-          Pkg.develop(PackageSpec(path=pwd()))
-          Pkg.instantiate()
-          Pkg.add(PackageSpec(name="Literate"))'
-          julia  -e 'include("docs/make_readme.jl")'
-      - name: Check if docs need to be updated
-        run: |
-          julia -e '
-          out = Cmd(`git diff --name-only`) |> read |> String
-          if out == ""
-              exit(0)
-          else
-              @error "The docs are outdated, rerun Literate to regenerate them."
-              write(stdout, out)
-              out_diff = Cmd(`git diff`) |> read |> String
-              @error "Diff:"
-              write(stdout, out_diff)
-              exit(1)
-              @error ""
-          end'
+    uses: "ITensor/ITensorActions/.github/workflows/LiterateCheck.yml@main"
+    with:
+      localregistry: https://github.com/ITensor/ITensorRegistry.git
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
new file mode 100644
index 0000000..5a0a306
--- /dev/null
+++ b/.github/workflows/Tests.yml
@@ -0,0 +1,42 @@
+name: Tests
+on:
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'release-'
+    tags: '*'
+    paths-ignore:
+      - 'docs/**'
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  # Cancel intermediate builds: only if it is a pull request build.
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  tests:
+    name: "Tests"
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - 'lts' # minimal supported version
+          - '1' # latest released Julia version
+        # group:
+        #   - 'core'
+        #   - 'optional'
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+    uses: "ITensor/ITensorActions/.github/workflows/Tests.yml@main"
+    with:
+      group: "${{ matrix.group }}"
+      julia-version: "${{ matrix.version }}"
+      os: "${{ matrix.os }}"
+      localregistry: https://github.com/ITensor/ITensorRegistry.git
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bff1fb7..6599365 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,8 @@ repos:
   - id: check-yaml
   - id: end-of-file-fixer
     exclude_types: [markdown]  # incompatible with Literate.jl
-- repo: https://github.com/qiaojunfeng/pre-commit-julia-format
-  rev: v0.2.0
+
+- repo: "https://github.com/domluna/JuliaFormatter.jl"
+  rev: v1.0.62  
   hooks:
-  - id: julia-format
+  - id: "julia-formatter"
diff --git a/Project.toml b/Project.toml
index dcfce15..5df2370 100644
--- a/Project.toml
+++ b/Project.toml
@@ -16,27 +16,11 @@ GradedUnitRanges = "e2de450a-8a67-46c7-b59c-01d5a3d041c5"
 [extensions]
 TensorAlgebraGradedUnitRangesExt = "GradedUnitRanges"
 
-[sources]
-GradedUnitRanges = {url = "https://github.com/ITensor/GradedUnitRanges.jl"}
-LabelledNumbers = {url = "https://github.com/ITensor/LabelledNumbers.jl"}
-
 [compat]
-Aqua = "0.8.9"
 ArrayLayouts = "1.10.4"
 BlockArrays = "1.2.0"
 EllipsisNotation = "1.8.0"
 GradedUnitRanges = "0.1.0"
-LabelledNumbers = "0.1.0"
 LinearAlgebra = "1.10"
-Test = "1.10"
 TupleTools = "1.6.0"
 julia = "1.10"
-
-[extras]
-Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
-GradedUnitRanges = "e2de450a-8a67-46c7-b59c-01d5a3d041c5"
-LabelledNumbers = "f856a3a6-4152-4ec4-b2a7-02c1a55d7993"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[targets]
-test = ["Aqua", "Test"]
diff --git a/README.md b/README.md
index d6162ab..7c4989b 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,31 @@
 
 [![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://ITensor.github.io/TensorAlgebra.jl/stable/)
 [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://ITensor.github.io/TensorAlgebra.jl/dev/)
-[![Build Status](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/CI.yml?query=branch%3Amain)
+[![Build Status](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/Tests.yml/badge.svg?branch=main)](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/Tests.yml?query=branch%3Amain)
 [![Coverage](https://codecov.io/gh/ITensor/TensorAlgebra.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/ITensor/TensorAlgebra.jl)
 [![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)
 [![Aqua](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl)
 
 ## Installation instructions
 
+This package resides in the `ITensor/ITensorRegistry` local registry.
+In order to install, simply add that registry through your package manager.
+This step is only required once.
 ```julia
 julia> using Pkg: Pkg
 
-julia> Pkg.add(url="https://github.com/ITensor/TensorAlgebra.jl")
+julia> Pkg.Registry.add(url="https://github.com/ITensor/ITensorRegistry")
+```
+or:
+```julia
+julia> Pkg.Registry.add(url="git@github.com:ITensor/ITensorRegistry.git")
+```
+if you want to use SSH credentials, which can make it so you don't have to enter your Github ursername and password when registering packages.
+
+Then, the package can be added as usual through the package manager:
+
+```julia
+julia> Pkg.add("TensorAlgebra")
 ```
 
 ## Examples
diff --git a/examples/README.jl b/examples/README.jl
index 69f2260..33853d4 100644
--- a/examples/README.jl
+++ b/examples/README.jl
@@ -2,18 +2,36 @@
 # 
 # [![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://ITensor.github.io/TensorAlgebra.jl/stable/)
 # [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://ITensor.github.io/TensorAlgebra.jl/dev/)
-# [![Build Status](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/CI.yml?query=branch%3Amain)
+# [![Build Status](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/Tests.yml/badge.svg?branch=main)](https://github.com/ITensor/TensorAlgebra.jl/actions/workflows/Tests.yml?query=branch%3Amain)
 # [![Coverage](https://codecov.io/gh/ITensor/TensorAlgebra.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/ITensor/TensorAlgebra.jl)
 # [![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)
 # [![Aqua](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl)
 
 # ## Installation instructions
 
+# This package resides in the `ITensor/ITensorRegistry` local registry.
+# In order to install, simply add that registry through your package manager.
+# This step is only required once.
 #=
 ```julia
 julia> using Pkg: Pkg
 
-julia> Pkg.add(url="https://github.com/ITensor/TensorAlgebra.jl")
+julia> Pkg.Registry.add(url="https://github.com/ITensor/ITensorRegistry")
+```
+=#
+# or:
+#=
+```julia
+julia> Pkg.Registry.add(url="git@github.com:ITensor/ITensorRegistry.git")
+```
+=#
+# if you want to use SSH credentials, which can make it so you don't have to enter your Github ursername and password when registering packages.
+
+# Then, the package can be added as usual through the package manager:
+
+#=
+```julia
+julia> Pkg.add("TensorAlgebra")
 ```
 =#
 
diff --git a/src/LinearAlgebraExtensions/qr.jl b/src/LinearAlgebraExtensions/qr.jl
index 7c0d3f0..903efa9 100644
--- a/src/LinearAlgebraExtensions/qr.jl
+++ b/src/LinearAlgebraExtensions/qr.jl
@@ -47,6 +47,7 @@ function LinearAlgebra.qr(a::LayoutMatrix, biperm::BlockedPermutation{2})
 end
 
 # TODO: Define in terms of an inner function `_qr` or `tensor_qr`.
+# TODO: this is type piracy
 function LinearAlgebra.qr(
   a::AbstractArray, labels_a::Tuple, labels_q::Tuple, labels_r::Tuple
 )
diff --git a/src/fusedims.jl b/src/fusedims.jl
index c118dc6..35a2823 100644
--- a/src/fusedims.jl
+++ b/src/fusedims.jl
@@ -29,13 +29,17 @@ end
 ⊗() = Base.OneTo(1)
 
 # Overload this version for most arrays
-function fusedims(a::AbstractArray, axes::AbstractUnitRange...)
-  return fusedims(FusionStyle(a), a, axes...)
+function fusedims(a::AbstractArray, ax::AbstractUnitRange, axes::AbstractUnitRange...)
+  return fusedims(FusionStyle(a), a, ax, axes...)
 end
 
 # Overload this version for fusion tensors, array maps, etc.
-function fusedims(a::AbstractArray, axesblocks::Tuple{Vararg{AbstractUnitRange}}...)
-  return fusedims(a, flatten_tuples(axesblocks)...)
+function fusedims(
+  a::AbstractArray,
+  axb::Tuple{Vararg{AbstractUnitRange}},
+  axesblocks::Tuple{Vararg{AbstractUnitRange}}...,
+)
+  return fusedims(a, flatten_tuples((axb, axesblocks...))...)
 end
 
 # Fix ambiguity issue
diff --git a/test/Project.toml b/test/Project.toml
index 2b28574..487e9ee 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -10,12 +10,14 @@ NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 TensorAlgebra = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
 TensorOperations = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
-[sources]
-GradedUnitRanges = {url = "https://github.com/ITensor/GradedUnitRanges.jl"}
-LabelledNumbers = {url = "https://github.com/ITensor/LabelledNumbers.jl"}
-TensorAlgebra = {path = ".."}
-
 [compat]
 TensorOperations = "4.1.1"
+Aqua = "0.8.9"
+SafeTestsets = "0.1"
+Suppressor = "0.2"
+Test = "1.10"
diff --git a/test/runtests.jl b/test/runtests.jl
index 243e751..bd97441 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,12 +1,61 @@
-@eval module $(gensym())
-using Test: @testset
+using SafeTestsets: @safetestset
+using Suppressor: Suppressor
 
-@testset "TensorAlgebra.jl" begin
-  filenames = filter(readdir(@__DIR__)) do f
-    startswith("test_")(f) && endswith(".jl")(f)
+# check for filtered groups
+# either via `--group=ALL` or through ENV["GROUP"]
+const pat = r"(?:--group=)(\w+)"
+arg_id = findfirst(contains(pat), ARGS)
+const GROUP = uppercase(
+  if isnothing(arg_id)
+    get(ENV, "GROUP", "ALL")
+  else
+    only(match(pat, ARGS[arg_id]).captures)
+  end,
+)
+
+"match files of the form `test_*.jl`, but exclude `*setup*.jl`"
+istestfile(fn) =
+  endswith(fn, ".jl") && startswith(basename(fn), "test_") && !contains(fn, "setup")
+"match files of the form `*.jl`, but exclude `*_notest.jl` and `*setup*.jl`"
+isexamplefile(fn) =
+  endswith(fn, ".jl") && !endswith(fn, "_notest.jl") && !contains(fn, "setup")
+
+@time begin
+  # tests in groups based on folder structure
+  for testgroup in filter(isdir, readdir(@__DIR__))
+    if GROUP == "ALL" || GROUP == uppercase(testgroup)
+      for file in filter(istestfile, readdir(joinpath(@__DIR__, testgroup); join=true))
+        @eval @safetestset $file begin
+          include($file)
+        end
+      end
+    end
+  end
+
+  # single files in top folder
+  for file in filter(istestfile, readdir(@__DIR__))
+    (file == basename(@__FILE__)) && continue # exclude this file to avoid infinite recursion
+    @eval @safetestset $file begin
+      include($file)
+    end
   end
-  @testset "Test $filename" for filename in filenames
-    include(filename)
+
+  # test examples
+  examplepath = joinpath(@__DIR__, "..", "examples")
+  for (root, _, files) in walkdir(examplepath)
+    contains(chopprefix(root, @__DIR__), "setup") && continue
+    for file in filter(isexamplefile, files)
+      filename = joinpath(root, file)
+      @eval begin
+        @safetestset $file begin
+          $(Expr(
+            :macrocall,
+            GlobalRef(Suppressor, Symbol("@suppress")),
+            LineNumberNode(@__LINE__, @__FILE__),
+            :(include($filename)),
+          ))
+        end
+      end
+    end
   end
 end
-end
diff --git a/test/test_aqua.jl b/test/test_aqua.jl
new file mode 100644
index 0000000..5c6c040
--- /dev/null
+++ b/test/test_aqua.jl
@@ -0,0 +1,8 @@
+using TensorAlgebra: TensorAlgebra
+using Aqua: Aqua
+using Test: @testset
+
+@testset "Code quality (Aqua.jl)" begin
+  # TODO: fix and re-enable ambiguity checks
+  Aqua.test_all(TensorAlgebra; ambiguities=false, piracies=false)
+end
diff --git a/test/test_basics.jl b/test/test_basics.jl
index 59065a1..7421879 100644
--- a/test/test_basics.jl
+++ b/test/test_basics.jl
@@ -1,4 +1,3 @@
-@eval module $(gensym())
 using BlockArrays: blockfirsts, blocklasts, blocklength, blocklengths, blocks
 using Combinatorics: permutations
 using EllipsisNotation: var".."
@@ -196,4 +195,3 @@ end
   )
   @test a ≈ a′
 end
-end
diff --git a/test/test_gradedunitrangesext_basics.jl b/test/test_gradedunitrangesext_basics.jl
index fbb0219..881c151 100644
--- a/test/test_gradedunitrangesext_basics.jl
+++ b/test/test_gradedunitrangesext_basics.jl
@@ -1,4 +1,3 @@
-@eval module $(gensym())
 using BlockArrays: Block
 using TensorAlgebra: ⊗
 using GradedUnitRanges: GradedUnitRanges, gradedrange, label
@@ -27,4 +26,3 @@ GradedUnitRanges.fuse_labels(l1::U1, l2::U1) = U1(l1.dim + l2.dim)
   @test a[Block(3)] == 16:23
   @test a[Block(4)] == 24:35
 end
-end
diff --git a/test/test_gradedunitrangesext_contract.jl b/test/test_gradedunitrangesext_contract.jl
index 51f1ef4..2b0655f 100644
--- a/test/test_gradedunitrangesext_contract.jl
+++ b/test/test_gradedunitrangesext_contract.jl
@@ -1,4 +1,3 @@
-@eval module $(gensym())
 using Test: @test_skip
 # TODO: Add this back once `BlockSparseArrays` is set up.
 @test_skip begin
@@ -36,4 +35,3 @@ using Test: @test_skip
     @test a_dest ≈ a_dest_dense
   end
 end
-end