Work on improving tests.