Separated classifiers from server logic, separated tests