WIP: test.sh fixup