Improved the testing