Improvements to the tests.