Update to improve the use of the test set