Some more improvements to tests.