Improving tests.