Minor changes to classifier to make it pass all JUnit tests.