Improved the test a little.