A few more test-related changes that I forgot to commit previously.