A few more test fix-ups