Add more tests for the classifier