Improve the tests.