+ fix bug with classification labels
+ fix some unit tests