Improvements in tests.