tests: fix some more tests
8 files changed