Improved tests.