Improve test set measurement