Improved the test