Minor refactoring changes.
New mahout test
Minor changes.