Multiclass and Probability Tests

Also simplified the testing structure to make it easier to write tests
for classification.