fix: accidentally swapped some tests
more tests (and a bit of restructuring)