tests: fix most remaining failures