Refator classifier test, remove unused dataset, add cross validation evaluation