Test evaluation improved