More minor fixes after recent refactoring.
Simplify classifiers module and add tests.