Improved speed of test 'prediction'