classifier type and data source not taken into account in org.apache.mahout.classifier.bayes.TestClassifier

This concerns the latest version of Mahout checked out from the SVN repo (I believe 0.4)

When launching TestClassifier using:

$MAHOUT_HOME/bin/mahout testclassifier -m model -d test-input -type cbayes -ng 1 -source hbase

The output says that the classifier type is Bayes (not Complementary) and the data source is HDFS.

After a quick investigation in TestClassifer.java source, there are mistakes on lines: 142, 147, 148
with classifierType instead of typeOpt, and dataSource instead of dataSourceOpt