Improving the testing