Improved the tests