More improvements to tests.