added test_classifier, changed some variable names