Fix for classifiers and new test.