MAHOUT-1045: committing patch with changes to unit tests. CDbw numbers still need user testing but ClusterEvaluater results are improved. All tests run