Improvements to tests.