Added two classfiers with tests. Code refactoring