Added cross validation and test sets