Classifier: bringing test classification in line with full classification