tests: fix a few recently-broken tests