Minor improvements to tests.