cross validation support, pruned test/train data files, minor changes in test script