diff --git a/tests/gh-r.zunit b/tests/gh-r.zunit
index 221a01231..0e6b3f6f3 100755
--- a/tests/gh-r.zunit
+++ b/tests/gh-r.zunit
@@ -1,7 +1,7 @@
 #!/usr/bin/env zunit
 
 @setup {
-  zinit default-ice as'null' from"gh-r" lbin'!' lucid nocompile nocompletions
+  zinit default-ice as'null' from"gh-r" lbin'!' nocompile nocompletions
   ZBIN=$ZPFX/bin
 }
 
@@ -19,9 +19,9 @@
 @test 'alist' { # A file list program that supports multiple storage, powered by Gin and React
   run zinit lbin'!* -> alist' for @alist-org/alist; assert $state equals 0
   local alist="$ZBIN/alist"; assert "$alist" is_executable
-  $alist --version; assert $state equals 0
+  $alist version; assert $state equals 0
 }
-@test 'asciigraph' { # Go package to make lightweight ASCII line graph ╭┈╯ in command line apps with no other dependencies.
+@test 'asciigraph' { # Go package to make lightweight ASCII line graphs in command line apps with no external dependencies.
   run zinit for @guptarohit/asciigraph; assert $state equals 0
   local asciigraph="$ZBIN/asciigraph"; assert "$asciigraph" is_executable
   $asciigraph --help; assert $state equals 0
@@ -31,11 +31,11 @@
   local assh="$ZBIN/assh"; assert "$assh" is_executable
   $assh --version; assert $state equals 0
 }
-@test 'atmos' { # Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)
-  run zinit for lbin'!* -> atmos' @cloudposse/atmos; assert $state equals 0
-  local atmos="$ZBIN/atmos"; assert "$atmos" is_executable
-  $atmos version; assert $state equals 0
-}
+# @test 'atmos' { # Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)
+#   run zinit for lbin'!* -> atmos' @cloudposse/atmos; assert $state equals 0
+#   local atmos="$ZBIN/atmos"; assert "$atmos" is_executable
+#   $atmos version; assert $state equals 0
+# }
 @test 'atuin' { #  Magical shell history
   run zinit for @ellie/atuin; assert $state equals 0
   local atuin="$ZBIN/atuin"; assert "$atuin" is_executable
@@ -62,11 +62,12 @@
   local bazel="$ZBIN/bazel"; assert "$bazel" is_executable
   $bazel --version; assert $state equals 0
 }
-@test 'bit' { # A tool for composable software development
-  run zinit lbin'!* -> bit' for @teambit/bit; assert $state equals 0
-  local bit="$ZBIN/bit"; assert "$bit" is_executable
-  $bit --version; assert $state equals 0
-}
+# TODO: gh-r does not find older assets anymore (possible bug from https://github.com/zdharma-continuum/zinit/pull/373)
+# @test 'bit' { # A tool for composable software development
+#   run zinit lbin'!* -> bit' for @teambit/bit; assert $state equals 0
+#   local bit="$ZBIN/bit"; assert "$bit" is_executable
+#   $bit --version; assert $state equals 0
+# }
 @test 'blast' { # Blast is a simple tool for API load testing and batch jobs
   run zinit for @dave/blast; assert $state equals 0
   local blast="$ZBIN/blast"; assert "$blast" is_executable
@@ -161,23 +162,17 @@
   local credential_desktop="$ZBIN/docker-credential-desktop"; assert "$credential_desktop" is_executable
   $credential_desktop version; assert $state equals 0
 }
-@test 'documize' { # Modern Confluence alternative designed for internal & external docs, built with
+@test 'documize' { # Modern Confluence alternative designed for internal & external docs, built with Go & Ember JS
   run zinit lbin'!* -> documize' for @documize/community; assert $state equals 0
   local documize="$ZBIN/documize"; assert "$documize" is_executable
   $documize version; assert $state equals 0
 }
-@test 'dog' { # A command-line DNS client.
-  if [[ $OSTYPE =~ 'linux.*' ]]; then skip 'ogham/dog only tested for macOS'; fi
-  run zinit as'completion' mv'**/dog.zsh -> _dog' for @ogham/dog; assert $state equals 0
-  local dog="$ZBIN/dog"; assert "$dog" is_executable
-  $dog --version; assert $state equals 0
-}
-@test 'dua' { # View disk space usage and delete unwanted data, fast.
+@test 'dua' { # View disk space usage and delete unwanted data, fast
   run zinit lbin'!**/dua' for @Byron/dua-cli; assert $state equals 0
   local dua="$ZBIN/dua"; assert "$dua" is_executable
   $dua --version; assert $state equals 0
 }
-@test 'duci' { # The simple ci server
+@test 'duci' { # The simple CI server
   run zinit lbin'!**/duci' for @duck8823/duci; assert $state equals 0
   local duci="$ZBIN/duci"; assert "$duci" is_executable
   $duci version; assert $state equals 0
@@ -197,12 +192,12 @@
   local etcd="$ZBIN/etcd"; assert "$etcd" is_executable
   $etcd --version; assert $state equals 0
 }
-@test 'exa' { # A modern replacement for ‘ls’.
+@test 'exa' { # A modern replacement for ls
   run zinit lbin'!**/exa' for ogham/exa; assert $state equals 0
   local exa="$ZBIN/exa"; assert "$exa" is_executable
   $exa --version; assert $state equals 0
 }
-@test 'fd' { # A simple, fast and user-friendly alternative to 'find
+@test 'fd' { # A fast, simple, and user-friendly alternative to find
   run zinit for @sharkdp/fd; assert $state equals 0
   local fd="$ZBIN/fd"; assert "$fd" is_executable
   $fd version; assert $state equals 0
@@ -263,7 +258,7 @@
   local ghq="$ZBIN/ghq"; assert "$ghq" is_executable
   $ghq --version; assert $state equals 0
 }
-@test 'git-chglog' { # CHANGELOG generator implemented in Go (Golang)
+@test 'git-chglog' { # CHANGELOG generator implemented in Go
   run zinit for @git-chglog/git-chglog; assert $state equals 0
   local git_chglog="$ZBIN/git-chglog"; assert "$git_chglog" is_executable
   $git_chglog --version; assert $state equals 0
@@ -271,14 +266,15 @@
 @test 'git-mkver' { # Automatic Semantic Versioning for git based software development
   run zinit for @idc101/git-mkver; assert $state equals 0
   local git_mkver="$ZBIN/git-mkver"; assert "$git_mkver" is_executable
-  $git_mkver info # use git-mkver be;cause --version exits with 130...? assert $state equals 0
+  # use git-mkver info because --version exits with 130?
+  $git_mkver info; assert $state equals 0
 }
 @test 'git-sizer' { # Compute various size metrics for a Git repository, flagging those that might cause problems
   run zinit for @github/git-sizer; assert $state equals 0
   local git_sizer="$ZBIN/git-sizer"; assert "$git_sizer" is_executable
   $git_sizer --version; assert $state equals 0
 }
-@test 'glow' { # Render markdown on the CLI, with pizzazz!
+@test 'glow' { # Render markdown on the CLI, with pizzazz
   run zinit for @charmbracelet/glow; assert $state equals 0
   local git_sizer="$ZBIN/glow"; assert "$git_sizer" is_executable
   $git_sizer --version; assert $state equals 0
@@ -315,7 +311,7 @@
   $got --version; assert $state equals 0
 }
 @test 'gotestfmt' { # go test output for humans
-  run zinit for @haveyoudebuggedit/gotestfmt; assert $state equals 0
+  run zinit for @GoTestTools/gotestfmt; assert $state equals 0
   local gotestfmt="$ZBIN/gotestfmt"; assert "$gotestfmt" is_executable
   $gotestfmt --help; assert $state equals 0
 }
@@ -339,7 +335,9 @@
   local hadolint="$ZBIN/hadolint"; assert "$hadolint" is_executable
   $hadolint --version; assert $state equals 0
 }
+# TODO: gh-r does not find older assets anymore (possible bug from https://github.com/zdharma-continuum/zinit/pull/373)
 @test 'heksa' { # CLI hex dumper with colors
+  if [[ $OSTYPE =~ 'darwin.*' ]]; then skip 'heksa only tested for Linux/GNU'; fi
   run zinit for @raspi/heksa; assert $state equals 0
   local heksa="$ZBIN/heksa"; assert "$heksa" is_executable
   $heksa --version; assert $state equals 0
@@ -385,7 +383,7 @@
   local insect="$ZBIN/insect"; assert "$insect" is_executable
   $insect help; assert $state equals 0
 }
-@test 'joincap' { # Merge multiple pcap files together, gracefully.
+@test 'joincap' { # Merge multiple pcap files together, gracefully
   run zinit lbin'!* -> joincap' for @assafmo/joincap; assert $state equals 0
   local joincap="$ZBIN/joincap"; assert "$joincap" is_executable
   $joincap --version; assert $state equals 0
@@ -400,18 +398,18 @@
   local just="$ZBIN/just"; assert "$just" is_executable
   $just --version; assert $state equals 0
 }
-@test 'keepassxc' { # a cross-platform community-driven port of the Windows application “Keepass Password Safe
+@test 'keepassxc' { # a cross-platform community-driven port of the Windows application 'Keepass Password Safe'
   if [[ $OSTYPE =~ 'linux.*' ]]; then skip 'keepassxc test only ran on macOS'; fi
   run zinit for @keepassxreboot/keepassxc; assert $state equals 0
   local keepassxc="$ZBIN/keepassxc"; assert "$keepassxc" is_executable
   $keepassxc -v; assert $state equals 0
 }
 @test 'ko' { # Build and deploy Go applications on Kubernetes
-  run zinit for google/ko; assert $state equals 0
+  run zinit for ko-build/ko; assert $state equals 0
   local ko="$ZBIN/ko"; assert "$ko" is_executable
   $ko version; assert $state equals 0
 }
-@test 'kopia' { # Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication.
+@test 'kopia' { # Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication
 run zinit for @kopia/kopia; assert $state equals 0
 local kopia="$ZBIN/kopia"; assert "$kopia" is_executable
 $kopia --version; assert $state equals 0
@@ -432,7 +430,7 @@ $kopia --version; assert $state equals 0
   $lf -version; assert $state equals 0
 }
 @test 'lsd' { # The next gen ls command
-  run zinit for Peltoche/lsd; assert $state equals 0
+  run zinit for @Peltoche/lsd; assert $state equals 0
   local lsd="$ZBIN/lsd"; assert "$lsd" is_executable
   $lsd --version; assert $state equals 0
 }
@@ -474,7 +472,7 @@ $kopia --version; assert $state equals 0
   $mkcert --version; assert $state equals 0
 }
 @test 'mmake' { # A Make/rake-like dev tool using Go
-  run zinit for @tj/mmake; assert $state equals 0
+  run zinit for ver'v1.3.0' lbin'!* -> mmake' @tj/mmake; assert $state equals 0
   local mmake="$ZBIN/mmake"; assert "$mmake" is_executable
   $mmake --version; assert $state equals 0
 }
@@ -544,12 +542,12 @@ $kopia --version; assert $state equals 0
   local pulumi="$ZBIN/pulumi"; assert "$pulumi" is_executable
   $pulumi version; assert $state equals 0
 }
-@test 'rare' { # Realtime regex-extraction and aggregation into common formats such as histograms, bar graphs, tables, etc.
+@test 'rare' { # Realtime regex-extraction and aggregation into common formats such as histograms, bar graphs, tables, etc
   run zinit for @zix99/rare; assert $state equals 0
   local rare="$ZBIN/rare"; assert "$rare" is_executable
   $rare --version; assert $state equals 0
 }
-@test 'rclone' { # Realtime regex-extraction and aggregation into common formats such as histograms, bar graphs, tables, etc.
+@test 'rclone' { # Realtime regex-extraction and aggregation into common formats such as histograms, bar graphs, tables, etc
   run zinit for @rclone/rclone; assert $state equals 0
   local rclone="$ZBIN/rclone"; assert "$rclone" is_executable
   $rclone --version; assert $state equals 0
@@ -559,8 +557,9 @@ $kopia --version; assert $state equals 0
   local reg="$ZBIN/reg"; assert "$reg" is_executable
   $reg version; assert $state equals 0
 }
+# TODO: gh-r does not find older assets anymore (possible bug from https://github.com/zdharma-continuum/zinit/pull/373)
 @test 'rip' { # A safe and ergonomic alternative to rm
-  run zinit for @nivekuil/rip; assert $state equals 0
+  run zinit ver'0.11.3' for @nivekuil/rip; assert $state equals 0
   local rip="$ZBIN/rip"; assert "$rip" is_executable
   $rip --version; assert $state equals 0
 }
@@ -580,7 +579,7 @@ $kopia --version; assert $state equals 0
   local rust_analyzer="$ZBIN/rust-analyzer"; assert "$rust_analyzer" is_executable
   $rust_analyzer --version; assert $state equals 0
 }
-@test 's' { # Open a web search in your terminal.
+@test 's' { # Open a web search in your terminal
   run zinit for @zquestz/s; assert $state equals 0
   local s="$ZBIN/s"; assert "$s" is_executable
   $s --version; assert $state equals 0
diff --git a/tests/plugins.zunit b/tests/plugins.zunit
index 0e4c625a6..59f7c1c7e 100755
--- a/tests/plugins.zunit
+++ b/tests/plugins.zunit
@@ -1,24 +1,30 @@
 #!/usr/bin/env zunit
 
-@test 'nnn' {
-  run zinit light-mode for jarun/nnn
-  zinit cd jarun/nnn
-  run PREFIX=$ZPFX make install; assert $state equals 0
-  local nnn="$ZPFX/bin/nnn";     assert $nnn   is_executable
-  $nnn -V;                       assert $state equals 0
+
+@setup {
+  zinit default-ice as'null' light-mode nocompile nocompletions
+  ZBIN=$ZPFX/bin
 }
+
+# @test 'nnn' {
+#   run zinit light-mode for jarun/nnn
+#   zinit cd jarun/nnn
+#   run PREFIX=$ZPFX make install; assert $state equals 0
+#   local nnn="$ZPFX/bin/nnn";     assert $nnn   is_executable
+#   $nnn -V;                       assert $state equals 0
+# }
 @test 'pipes' {
-  run zinit light-mode for @pipeseroni/pipes.sh
-  zinit cd pipeseroni/pipes.sh
-  run make PREFIX=$ZPFX install;    assert $state equals 0
-  local pipes="$ZPFX/bin/pipes.sh"; assert $pipes is_executable
-  $pipes -v;                        assert $state equals 0
+  run zinit for @pipeseroni/pipes.sh
+  # zinit cd pipeseroni/pipes.sh
+  run zinit run pipeseroni/pipes.sh make PREFIX=$ZPFX install; assert $state equals 0
+  local pipes="$ZBIN/pipes.sh"; assert $pipes is_executable
+  $pipes -v; assert $state equals 0
 }
 @test 'tree' {
   run zinit light-mode for Old-Man-Programmer/tree
   zinit cd Old-Man-Programmer/tree
   run make PREFIX=$ZPFX install; assert $state equals 0
-  local tree="$ZPFX/bin/tree";   assert $tree  is_executable
+  local tree="$ZBIN/tree";   assert $tree  is_executable
   $tree -v;                      assert $state equals 0
 }
 @test 'vim' {
@@ -26,7 +32,7 @@
   zinit cd vim/vim
   run ./configure --prefix=$ZPFX && make PREFIX=$ZPFX install
   assert $state equals 0
-  local vim="$ZPFX/bin/vim"; assert $vim is_executable
+  local vim="$ZBIN/vim"; assert $vim is_executable
   $vim --version; assert $state equals 0
 }
 # @test 'zsh_bin' {