Improved the tests.