Various minor updates to tests.