Improved the test.