testing, changes to classes

More unit tests, changes to main and classification.  Fixed indentation